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

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

@@ -92,10 +92,10 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "救援方格")
     private String rescueGrid;
 
-    @ApiModelProperty(value = "坐标x")
+    @ApiModelProperty(value = "经度")
     private String coordinateX;
 
-    @ApiModelProperty(value = "坐标y")
+    @ApiModelProperty(value = "纬度")
     private String coordinateY;
 
     @ApiModelProperty(value = "更新时间")

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

@@ -56,7 +56,6 @@ mqtt.topic.command.alert.notice=alertNotice
 ## 跑马灯地震，天气预警信息
 mqtt.topic.command.seismometeorology.notice=seismometeorology
 
-##feigen config
-##Amos平台服务名
-security.systemctl.name=AMOS-API-SYSTEMCTL
+security.systemctl.name=AMOS-API-SYSTEMCTL
+