From ecd5b6b51b7ddc4efe63c49c3c68adb276a2a2cb Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 06 三月 2026 15:08:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
index 5ef6604..bb7b249 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
@@ -89,7 +89,7 @@
      */
     @ApiModelProperty(value = "鍙法鍖哄尯鍩焛d")
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<Long> crossZoneArea;
+    private List<Integer> crossZoneArea;
 
     /**
      * 鏄惁wcs绔欑偣
@@ -108,7 +108,7 @@
      */
     @ApiModelProperty(value = "瀹瑰櫒绫诲瀷")
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<Long> containerType;
+    private List<Integer> containerType;
 
     /**
      * 鏉$爜
@@ -276,4 +276,6 @@
                 return null;
         }
     }
+
+
 }

--
Gitblit v1.9.1