Merge remote-tracking branch 'origin/main'

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java

ruoyi-admin/src/main/java/com/ruoyi/bas/port/domain/WcsPort.java

@@ -46,10 +46,29 @@ public class WcsPort extends BaseEntity
     @Excel(name = "备用字段")
     private String spare3;
 
+    private String spare4;
+    private String spare5;
+
     /** 状态 */
     @Excel(name = "状态")
     private String status;
 
+    public String getSpare5() {
+        return spare5;
+    }
+
+    public void setSpare5(String spare5) {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare4() {
+        return spare4;
+    }
+
+    public void setSpare4(String spare4) {
+        this.spare4 = spare4;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

ruoyi-admin/src/main/resources/mapper/bas/WcsPortMapper.xml

@@ -13,11 +13,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare1"    column="spare1"    />
         <result property="spare2"    column="spare2"    />
         <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
         <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectWcsPortVo">
-        select id, port_code, port_name, port_type, port_region, spare1, spare2, spare3, status from wcs_port
+        select id, port_code, port_name, port_type, port_region, spare1, spare2, spare3, status,spare4,spare5 from wcs_port
     </sql>
 
     <select id="selectWcsPortList" parameterType="WcsPort" resultMap="WcsPortResult">
@@ -30,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
             <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
             <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
         </where>
     </select>
@@ -53,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare1 != null">spare1,</if>
             <if test="spare2 != null">spare2,</if>
             <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
             <if test="status != null">status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -63,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare1 != null">#{spare1},</if>
             <if test="spare2 != null">#{spare2},</if>
             <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
             <if test="status != null">#{status},</if>
          </trim>
     </insert>
@@ -77,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare1 != null">spare1 = #{spare1},</if>
             <if test="spare2 != null">spare2 = #{spare2},</if>
             <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="status != null">status = #{status},</if>
         </trim>
         where id = #{id}