application.properties
1.65 KB
-
Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc · d23c3691# Conflicts: # src/main/resources/application.properties # src/main/resources/quartz.properties
宋祥 authored
×
# Conflicts: # src/main/resources/application.properties # src/main/resources/quartz.properties