CodeCow/datax-web
1
0
Fork 0
mirror of https://github.com/WeiYe-Jing/datax-web.git synced 2026-06-13 21:00:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3090e02c19
datax-web/datax-admin
History
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 Merge branch 'dev' into v2.1.1 2020-03-19 10:08:46 +08:00