From 675db903cd534aa16b59f5e9bf87da3e699e5d30 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 29 七月 2023 16:36:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxfywcs' into jxfywcs
---
src/main/java/com/zy/asrs/entity/BasDevp.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 388c3e2..f50fec5 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -129,7 +129,7 @@
@ApiModelProperty(value= "鏉″舰鐮�")
private String barcode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍏ュ簱鏆傚瓨鏁�")
@TableField("in_qty")
private Integer inQty;
@@ -231,6 +231,10 @@
return "浣庡簱浣�";
case 2:
return "楂樺簱浣�";
+ case 3:
+ return "涓簱浣�";
+ case 4:
+ return "涓珮搴撲綅";
default:
return String.valueOf(this.locType1);
}
--
Gitblit v1.9.1