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-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1914,8 +1914,26 @@
             ALTER TABLE jc_alert_submitted MODIFY COLUMN sender varchar(50) DEFAULT  NULL COMMENT '发送人';
         </sql>
     </changeSet>
+    <changeSet author="ltw" id="2021-10-26-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_shift_change"/>
+        </preConditions>
+        <comment>119值班交接班填报新增工作日常字段</comment>
+        <sql>
+            ALTER TABLE `jc_shift_change` ADD duty_work varchar(4000) NULL COMMENT '日常工作';
+        </sql>
+    </changeSet>
 
 
+    <changeSet author="tw" id="2021-10-26-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_dynamic_form_column"/>
+        </preConditions>
+        <comment>修改岗位类型</comment>
+        <sql>
+            UPDATE cb_dynamic_form_column  SET field_type='treeSelect' WHERE field_code='positionType';
+        </sql>
+    </changeSet>
 
 
         </databaseChangeLog>