Merge remote-tracking branch 'origin/dev_upgrade' into dev_upgrade

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/EmergencyTaskContent.java

@@ -31,4 +31,8 @@ public class EmergencyTaskContent extends BasicEntity {
     @Column(name = "obligation_id")
     private Long obligationId;
 
+
+    //人员名称
+    @Column(name = "obligation_name")
+    private String obligationName;
 }
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_emergency_task.xml

@@ -8,7 +8,8 @@
         SELECT
             id,
             content,
-            code
+            code,
+            obligation_name as  obligationName
         FROM
             c_emergency_task_content
         <where>