From c80d68ee7d5ceb5f93289220a410737da3a7bf9f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 四月 2024 08:44:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ssdwcs' into ssdwcs
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 9 ++++++++-
1 files changed, 8 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 a18b5bf..572f0f8 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -91,7 +91,7 @@
@ApiModelProperty(value= "搴撲綅鍙�")
@TableField("loc_no")
- private Date locNo;
+ private String locNo;
@ApiModelProperty(value= "鐘舵��")
private String status;
@@ -134,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 "";
--
Gitblit v1.9.1