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

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

@@ -2141,8 +2141,9 @@
 
     <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"/>
+            <not>
+                <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+            </not>
         </preConditions>
         <comment>update data cb_data_dictionary</comment>
         <sql>
@@ -2153,8 +2154,9 @@
 
     <changeSet author="chenzhao" id="2021-11-16-1">
         <preConditions onFail="MARK_RAN">
-            <tableExists tableName="cb_dynamic_form_column"/>
-            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+            <not>
+                <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+            </not>
         </preConditions>
         <comment>insert data cb_dynamic_form_column</comment>
         <sql>
@@ -2218,5 +2220,42 @@
         </sql>
     </changeSet>
 
+
+<!--  insert 模板
+     <changeSet author="chenzhao" id="2021-11-16-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+            </not>
+        </preConditions>
+        <comment>insert data cb_dynamic_form_column</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 (132828674812087, 'dutyArea', '值班区域', 'input', 132828674815, 'like', b'0', b'0', 'dutyFireFighting', NULL, NULL, NULL, '2021-11-16 10:33:18', b'0', NULL, NULL, NULL);
+        </sql>
+    </changeSet>-->
+
+<!-- Update 示例
+    <changeSet author="chenzhao" id="2021-11-02-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_template"/>
+        </preConditions>
+        <comment>update data jc_template</comment>
+        <sql>
+            UPDATE `jc_template` SET content ='【120急救】时间：callTime；地址：address；被困人数：trappedNum；伤亡人数：casualtiesNum；性别：gender；年龄段(岁)：ageGroup；患者现状：patientStatus；情况说明：situation；警情阶段：alertStage' WHERE sequence_nbr=23;
+        </sql>
+    </changeSet>   -->
+
+<!-- 表字段修改
+    <changeSet author="chenzhao" id="2021-09-27-cz-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_fire_experts"/>
+        </preConditions>
+        <comment>BUG 2928 表中新增两个字段用来保存详细地址值 </comment>
+        <sql>
+            ALTER TABLE `cb_fire_experts` add native_place_val varchar(255) COMMENT '户籍所在地详细地址';
+        </sql>
+    </changeSet> -->
+
+
 </databaseChangeLog>