YeeAmosFireAutoSysStart/src/main/resources/application.properties · a89e1576a5d95cbacf3251cf6ad42dd0186caab6 · station / YeeAmosFireAutoSysRoot

Merge branch 'eqintegration' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into eqintegration · 49c52f4a

authored Nov 19, 2020

# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/config/PermissionAspect.java
#	YeeAmosFireAutoSysStart/src/main/resources/application.properties

49c52f4a

application.properties 2.26 KB

Replace application.properties