From 392aebed0af81c8369a3f07dfdc53cad1b59f6b4 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 09 三月 2023 16:53:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 21a45ed..6037263 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -33,7 +33,7 @@
     @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
     private String maktx;
 
-    @ApiModelProperty(value= "鎵瑰彿")
+    @ApiModelProperty(value= "搴忓垪鐮�")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -152,6 +152,9 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    @ApiModelProperty(value= "鏄惁鍐荤粨")
+    private Integer frozen;
+
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
         switch (this.beBatch){

--
Gitblit v1.9.1