From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/Pack.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Pack.java b/src/main/java/com/zy/asrs/entity/Pack.java
index fa0eded..686c8bd 100644
--- a/src/main/java/com/zy/asrs/entity/Pack.java
+++ b/src/main/java/com/zy/asrs/entity/Pack.java
@@ -49,9 +49,9 @@
private String matnr;
/**
- * 鎵瑰彿
+ * 搴忓垪鐮�
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value= "搴忓垪鐮�")
private String batch;
/**
@@ -61,7 +61,7 @@
private Long settle;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
@@ -120,7 +120,7 @@
// Pack pack = new Pack(
// null, // 鏉＄爜[闈炵┖]
// null, // 鍟嗗搧缂栧彿
-// null, // 鎵瑰彿
+// null, // 搴忓垪鐮�
// null, // 璁㈠崟鐘舵��
// null, // 鐘舵��
// null, // 娣诲姞鏃堕棿
--
Gitblit v1.9.1