字段添加liqubase 和 实体提交

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

@@ -393,6 +393,14 @@ public class WaterResourceDto extends BaseDto {
 	@ApiModelProperty("水池液位显示装置id")
 	private String levelDeviceId;
 
+	@ExcelIgnore
+	@ApiModelProperty("消防泵装置id")
+	private String pumpDeviceId;
+
+	@ExcelIgnore
+	@ApiModelProperty("消防泵装置名称")
+	private String pumpDeviceName;
+
 	@ApiModelProperty("水池液位显示装置名称")
 	@ExcelProperty(value = "水池液位显示装置", index = 45)
 	@ExplicitConstraint(indexNum = 45, sourceClass = CommonExplicitConstraint.class, method = "getListByEquipmentCode")

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourcePool.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -113,6 +115,18 @@ public class WaterResourcePool extends BaseEntity {
     private String levelDeviceName;
 
     /**
+     * 消防泵装置ids
+     */
+    @TableField("pump_device_id")
+    private String pumpDeviceId;
+
+    /**
+     * 消防泵装置名称s
+     */
+    @TableField("pump_device_name")
+    private String pumpDeviceName;
+
+    /**
      * 出口流量（L/s）
      */
     @TableField("output_flow_rate")

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

@@ -1101,4 +1101,18 @@
             ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
         </sql>
     </changeSet>
+
+    <changeSet author="zs" id="20240401-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_water_resource_pool" columnName="pump_device_id"/>
+            </not>
+        </preConditions>
+        <comment>modify table cb_water_resource_pool add columns</comment>
+        <sql>
+            ALTER TABLE `cb_water_resource_pool`
+            ADD pump_device_id varchar(1000) DEFAULT NULL COMMENT '消防泵装置ids',
+            ADD pump_device_name varchar(1500) DEFAULT NULL COMMENT '消防泵装置名称s';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -3957,4 +3957,18 @@
         </sql>
     </changeSet>
 
+    <changeSet author="zs" id="20240401-zs-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_water_resource_pool" columnName="pump_device_id"/>
+            </not>
+        </preConditions>
+        <comment>modify table cb_water_resource_pool add columns</comment>
+        <sql>
+            ALTER TABLE `cb_water_resource_pool`
+            ADD pump_device_id varchar(1000) DEFAULT NULL COMMENT '消防泵装置ids',
+            ADD pump_device_name varchar(1500) DEFAULT NULL COMMENT '消防泵装置名称s';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>