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/BasStationArea.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java
index 6bfec7b..c249379 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java
@@ -110,7 +110,7 @@
* 鏉＄爜
*/
@ApiModelProperty(value = "鏉＄爜")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS)
private String barcode;
/**
@@ -177,6 +177,13 @@
@TableField(typeHandler = JacksonTypeHandler.class)
private List<String> stationAlias;
+ /**
+ * 鍖哄煙鍖呭惈绔欑偣缂栧彿闆�
+ */
+ @ApiModelProperty(value = "鍖哄煙鍖呭惈绔欑偣缂栧彿闆�")
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<String> stationAliasStaNo;
+
public BasStationArea() {
}
@@ -188,7 +195,7 @@
- public List<Long> getContainerTypes$() {
+ public List<Long> getContainerTypes() {
if (Cools.isEmpty(this.containerType)) {
return new ArrayList<>();
}
--
Gitblit v1.9.1