You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

anthonywj 94a8464ca7 Merge remote-tracking branch 'origin/master' ... # Conflicts: # api-admin/target/classes/application-dev.properties # api-admin/target/classes/com/glxp/udidl/admin/config/GlobalConfig.class # api-admin/target/classes/com/glxp/udidl/admin/controller/device/TestController.class # api-admin/target/classes/com/glxp/udidl/admin/service/DataSync/DeviceSaveService.class		3 years ago
..
com/glxp/udidl/admin	Merge remote-tracking branch 'origin/master'	3 years ago
application-dev.properties	移除target目录，修改di查询，产品名称查询	3 years ago