application.properties
1.67 KB
-
Merge branch 'dev' of http://129.211.46.84:8800/platform/hp-smart · ddb8ce7d
Conflicts: src/main/resources/application.properties src/main/resources/quartz.properties
宋祥 authored
×
Conflicts: src/main/resources/application.properties src/main/resources/quartz.properties