Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-system-jcs/src/main/resources/application.properties

@@ -50,7 +50,7 @@ spring.redis.expire.time=300
 ## mqtt-警情初报消息主题
 mqtt.topic.alert.reporting=alertReporting
 
-## 实战指挥新警情?报主题
+## 实战指挥新警情�?�报主题
 mqtt.topic.command.alert.notice=alertNotice
 
 ## 跑马灯地震，天气预警信息
@@ -60,6 +60,8 @@ mqtt.topic.command.power.deployment=power
 
 security.systemctl.name=AMOS-API-SYSTEMCTL
 
+supervision.feign.name = AMOS-SUPERVISION-API
+
 iot.fegin.name=AMOS-API-IOT
 
 equip.fegin.name=AMOS-EQUIPMANAGE
\ No newline at end of file

amos-boot-system-maintenance/src/main/resources/application.properties

@@ -31,7 +31,7 @@ spring.liquibase.enabled=true
 
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
-equip.feign.name=AMOS-EQUIPMANAGE-SHG
+equip.feign.name=AMOS-EQUIPMANAGE
 equip.feign.prefix=/equip
 input.custom.prefix = QYZD
 input.statute.prefix = FG