From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java
index 7e4e280..a36a678 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java
@@ -47,7 +47,7 @@
private String siteNo;
@ApiModelProperty("Tag缂栫爜")
- @TableField("index")
+ @TableField("`index`")
private String index;
/**
@@ -145,15 +145,17 @@
* 鎾澧欏簱浣嶅鍣ㄧ爜
*/
@ApiModelProperty(value = "鎾澧欏簱浣嶅鍣ㄧ爜")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String barcode;
public CacheSite() {}
- public CacheSite(String siteNo,Integer siteStatus,Long orderId,String orderNo,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public CacheSite(String siteNo,Integer siteStatus,Long orderId,String orderNo,Long hostId,Integer status, String barcode,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
this.siteNo = siteNo;
this.siteStatus = siteStatus;
this.orderId = orderId;
this.orderNo = orderNo;
+ this.barcode = barcode;
this.hostId = hostId;
this.status = status;
this.deleted = deleted;
--
Gitblit v1.9.1