修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyFirstAidDto.java

@@ -10,37 +10,43 @@ import lombok.Data;
 @ApiModel(value = "DutyFirstAidDto", description = "120急救站值班")
 public class DutyFirstAidDto implements Serializable {
 	 private static final long serialVersionUID = 1L;
-		
+
 	    @ApiModelProperty(value = "用户id")
 	    private String userId;
-		
+
 	    @ApiModelProperty(value = "用户名称")
 	    private String userName;
-	    
+
 	    @ApiModelProperty(value = "单位ID")
 	    private String teamId;
-	   
+
 	    @ApiModelProperty(value = "单位名称")
 	    private String teamName;
-	    
+
 	    @ApiModelProperty(value = "岗位id")
 	    private String postType;
-	    
+
 	    @ApiModelProperty(value = "岗位名称")
 	    private String postTypeName;
-	    
+
 	    @ApiModelProperty(value = "值班信息")
 	    private List<DutyPersonShiftDto> dutyShift;
-	    
+
 	    @ApiModelProperty(value = "值班开始时间")
 	    private String startTime;
-	    
+
 	    @ApiModelProperty(value = "值班结束时间")
 	    private String endTime;
-	    
+
 	    @ApiModelProperty(value = "120急救站")
 	    private String firstAid;
-	    
+
 	    @ApiModelProperty(value = "120急救站Id")
 	    private String firstAidId;
+
+	    @ApiModelProperty(value = "值班区域")
+        private String dutyArea;
+
+	    @ApiModelProperty(value = "值班区域Id")
+        private String dutyAreaId;
 }

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2139,7 +2139,17 @@
         </sql>
     </changeSet>
 
-
+    <changeSet author="chenzhao" id="2021-11-15-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_dynamic_form_column"/>
+            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+        </preConditions>
+        <comment>update data cb_data_dictionary</comment>
+        <sql>
+            INSERT INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812085, 'dutyArea', '值班区域', 'input', 132828674816, 'like', b'0', b'0', 'dutyFirstAid', NULL, NULL, NULL, '2021-11-15 10:33:18', b'0', NULL, NULL, NULL);
+            INSERT INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812086, 'dutyAreaId', '值班区域Id', 'input', 132828674816, 'eq', b'0', b'0', 'dutyFirstAid', NULL, NULL, NULL, '2021-11-15 10:33:18', b'0', NULL, NULL, NULL);
+        </sql>
+    </changeSet>