From 18b35f1400df83e20a870dbfd7e97ae9ca277cbd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 13 五月 2025 14:49:38 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 206ebef..bfa10a0 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
@@ -66,7 +66,7 @@
      * 鎵�灞炲簱鍖篿d
      */
     @ApiModelProperty(value= "鎵�灞炲簱鍖篿d")
-    private Integer area;
+    private Long area;
 
     /**
      * 鏄惁鍙法鍖�
@@ -102,6 +102,7 @@
      * 鏉$爜
      */
     @ApiModelProperty(value= "鏉$爜")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String barcode;
 
     /**

--
Gitblit v1.9.1