From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
index d34dc3b..a70200f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
@@ -57,9 +57,9 @@
private Long code;
/**
- * 姣旂爜鏂瑰悜闃� 1: 澶т簬 0 灏忎簬
+ * 姣旂爜鏂瑰悜闃�
*/
- @ApiModelProperty(value= "姣旂爜鏂瑰悜闃� 1: 澶т簬 0 灏忎簬")
+ @ApiModelProperty(value= "姣旂爜鏂瑰悜闃�")
private Integer compDirect;
/**
@@ -78,19 +78,19 @@
* 鎺�
*/
@ApiModelProperty(value= "鎺�")
- private Integer row;
+ private Integer rowNo;
/**
* 鍒�
*/
@ApiModelProperty(value= "鍒�")
- private Integer bay;
+ private Integer bayNo;
/**
* 灞�
*/
@ApiModelProperty(value= "灞�")
- private Integer lev;
+ private Integer levNo;
/**
* 搴撲綅鐮�
@@ -160,7 +160,7 @@
public Loc() {}
- public Loc(String uuid,Long zoneId,String locNo,String name,Long code,Long locSts,Double offset,Integer row,Integer bay,Integer lev,String zpallet,Long locType,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Loc(String uuid,Long zoneId,String locNo,String name,Long code,Long locSts,Double offset,Integer rowNo,Integer bayNo,Integer levNo,String zpallet,Long locType,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.zoneId = zoneId;
this.locNo = locNo;
@@ -168,9 +168,9 @@
this.code = code;
this.locSts = locSts;
this.offset = offset;
- this.row = row;
- this.bay = bay;
- this.lev = lev;
+ this.rowNo = rowNo;
+ this.bayNo = bayNo;
+ this.levNo = levNo;
this.zpallet = zpallet;
this.locType = locType;
this.status = status;
--
Gitblit v1.9.1