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,11 +46,30 @@ public class WcsPort extends BaseEntity
     @Excel(name = "备用字段")
     private String spare3;
 
+    private String spare4;
+    private String spare5;
+
     /** 状态 */
     @Excel(name = "状态")
     private String status;
 
-    public void setId(Long id) 
+    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;
     }