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/dto/ShiftChangeDto.java

@@ -36,4 +36,7 @@ public class ShiftChangeDto extends BaseDto {
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 
+    @ApiModelProperty(value = "日常工作")
+    private String dutyWork;
+
 }

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

@@ -43,4 +43,10 @@ public class ShiftChange extends BaseEntity {
      */
     @TableField("remark")
     private String remark;
+
+    /**
+     * 日常工作
+     */
+    @TableField("duty_work")
+    private String dutyWork;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -129,7 +129,9 @@
         a.rescue_grid,
         a.coordinate_x,
         a.coordinate_y,
-        a.response_level
+        a.response_level,
+        a.system_source,
+        a.system_source_code
         FROM
         jc_alert_called a
         <where>