From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..f28af94 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,13 +108,13 @@
*/
@ApiModelProperty(value = "瀹瑰櫒绫诲瀷")
@TableField(typeHandler = JacksonTypeHandler.class)
- private List<Long> containerType;
+ private List<Integer> containerType;
/**
* 鏉＄爜
*/
@ApiModelProperty(value = "鏉＄爜")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS)
private String barcode;
/**
@@ -276,4 +276,6 @@
return null;
}
}
+
+
}
--
Gitblit v1.9.1