From ac0906df88505ec24ee910899a036676823f9d63 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 23d4a53..572f0f8 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -14,16 +14,18 @@
@TableName("cust_wait_pakin")
public class WaitPakin implements Serializable {
+ private static final long serialVersionUID = 1L;
+
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
@@ -36,31 +38,31 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "鍨嬪彿")
private String type;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "鏉＄爜")
private String color;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String warehouse;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String brand;
/**
@@ -84,12 +86,12 @@
/**
* 鐢ㄦ埛ID
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String bname;
@ApiModelProperty(value= "搴撲綅鍙�")
@TableField("loc_no")
- private Date locNo;
+ private String locNo;
@ApiModelProperty(value= "鐘舵��")
private String status;
@@ -132,6 +134,13 @@
@TableField("appe_user")
private Long appeUser;
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
+
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
@@ -145,4 +154,5 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+
}
--
Gitblit v1.9.1