From 010dc23827d3b1020356b6741ec47f7ce81497ab Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期五, 05 七月 2024 13:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs
---
src/main/java/com/zy/asrs/entity/Pack.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..c63e1f7 100644
--- a/src/main/java/com/zy/asrs/entity/Pack.java
+++ b/src/main/java/com/zy/asrs/entity/Pack.java
@@ -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