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/WaitPakin.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 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..b737c10 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,16 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "鏄惁鍐荤粨")
+ private Integer frozen;
+
+ /**
+ * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁}
+ */
+ @ApiModelProperty(value= "鐗╂枡绫诲瀷")
+ @TableField("mat_type")
+ private Integer matType;
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
@@ -219,4 +229,20 @@
public void sync(Object source) {
Synchro.Copy(source, this);
}
+
+ public String getMatType$() {
+ if (this.matType == null) {
+ return "";
+ }
+ switch (this.matType) {
+ case 1:
+ return "鍗曞搧";
+ case 2:
+ return "楂橀";
+ case 3:
+ return "娣锋斁";
+ default:
+ return "";
+ }
+ }
}
--
Gitblit v1.9.1