weiye 3090e02c19 Merge branch 'dev' into v2.1.1 ... # Conflicts: # .gitignore # datax-admin/src/main/java/com/wugui/datax/admin/controller/JobDatasourceController.java # datax-admin/src/main/java/com/wugui/datax/admin/mapper/JobGroupMapper.java # datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JdbcDatasourceQueryServiceImpl.java # datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/DataxJsonHelper.java # datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/reader/BaseReaderPlugin.java # datax-admin/src/main/java/com/wugui/datax/admin/tool/datax/writer/BaseWriterPlugin.java # datax-admin/src/main/java/com/wugui/datax/admin/tool/query/BaseQueryTool.java # datax-executor/src/main/java/com/wugui/datax/executor/service/jobhandler/ExecutorJobHandler.java		2020-03-19 10:08:46 +08:00
..
datax-web	hive构建json修改index获取方式	2020-01-17 18:57:59 +08:00
db	Merge branch 'dev' into v2.1.1	2020-03-19 10:08:46 +08:00
img	文档更新	2020-03-12 22:55:36 +08:00