From c3e47e5e70a9055b7d25c118eb1f7ec3c869e953 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 05 六月 2025 13:53:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms
---
src/main/java/com/zy/asrs/entity/LocMast.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 24b93ea..95e75e0 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -80,6 +80,12 @@
private Integer lev1;
/**
+ * 缁�
+ */
+ @ApiModelProperty(value= "缁�")
+ private Integer gro1;
+
+ /**
* 婊℃澘
*/
@ApiModelProperty(value= "婊℃澘")
@@ -106,7 +112,7 @@
@TableField("out_enable")
private String outEnable;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍏ュ簱鏃堕棿")
@TableField("io_time")
private Date ioTime;
@@ -215,9 +221,9 @@
case 0:
return "鏈煡";
case 1:
- return "灏忓簱浣�";
+ return "浣庡簱浣�";
case 2:
- return "澶у簱浣�";
+ return "楂樺簱浣�";
default:
return String.valueOf(this.locType1);
}
--
Gitblit v1.9.1