1.字段liubase位置调整

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2121,18 +2121,6 @@
             alter table `f_fire_fighting_system` add column `biz_org_name` varchar(128) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构/部门名称';
         </sql>
     </changeSet>
-
-    <changeSet author="chenzhao" id="2021-122201">
-        <preConditions onFail="MARK_RAN">
-            <tableExists tableName="cb_fire_station"/>
-        </preConditions>
-        <comment>新增机构/部门名称  机构编码  </comment>
-        <sql>
-            ALTER TABLE `cb_fire_station` add column `biz_org_name` varchar(104) DEFAULT NULL COMMENT '机构/部门名称';
-            ALTER TABLE `cb_fire_station` add column `biz_org_code` varchar(1000) DEFAULT NULL COMMENT '机构编码';
-        </sql>
-    </changeSet>
-
     <changeSet author="keyong" id="1640203458-1">
         <preConditions onFail="MARK_RAN">
             <not>

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

@@ -2388,6 +2388,27 @@
             UPDATE `cb_data_dictionary` SET name = '电话接报' WHERE sequence_nbr = 1328
         </sql>
     </changeSet>
-
+    <changeSet author="chenzhao" id="2021-122201-01">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_fire_station"  columnName="biz_org_code"/>
+            </not>
+        </preConditions>
+        <comment>新增机构/部门编码  </comment>
+        <sql>
+            ALTER TABLE `cb_fire_station` add column `biz_org_code` varchar(1000) DEFAULT NULL COMMENT '机构编码';
+        </sql>
+    </changeSet>
+    <changeSet author="chenzhao" id="2021-122201-02">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_fire_station"  columnName="biz_org_name"/>
+            </not>
+        </preConditions>
+        <comment>新增机构/部门名称</comment>
+        <sql>
+            ALTER TABLE `cb_fire_station` add column `biz_org_name` varchar(104) DEFAULT NULL COMMENT '机构/部门名称';
+        </sql>
+    </changeSet>
 </databaseChangeLog>