From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 十月 2023 15:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/entity/LocMast.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..4648d05 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -98,7 +98,7 @@
@TableField("loc_type2")
private Short locType2;
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ @ApiModelProperty(value= "搴撲綅绫诲瀷{1:娣锋斁,2:鍗曞搧}")
@TableField("loc_type3")
private Short locType3;
@@ -176,6 +176,13 @@
@TableField("ctn_no")
private String ctnNo;
+ @ApiModelProperty(value= "")
+ @TableField("qr_code_value")
+ private String qrCodeValue;
+
+ @ApiModelProperty(value= "")
+ private String status;
+
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
--
Gitblit v1.9.1