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
..
src	Merge branch 'dev' into v2.1.1	2020-03-19 10:08:46 +08:00
pom.xml	update: 指定maven编译插件jdk版本。修改日志位置	2020-03-09 22:37:15 +08:00