From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
index 620b11a..231133d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -76,7 +77,9 @@
@ApiModelProperty(value = "渚涘簲鍟�")
@ExcelColumn(name="渚涘簲鍟�")
private String inRepertotyCode;
-
+ @ApiModelProperty(value = "鏀惰揣鍦�")
+ @ExcelColumn(name="鏀惰揣鍦�")
+ private String repertotyAddress;
@ApiModelProperty(value = "璁″垝鏀惰揣鏁伴噺", example = "1")
@ExcelColumn(name="璁″垝鏀惰揣鏁伴噺")
private BigDecimal ioQty;
@@ -87,4 +90,22 @@
@ApiModelProperty(value = "涓婇攣鏃堕棿")
@ExcelColumn(name="涓婇攣鏃堕棿")
private String lockDate;
+
+ @ApiModelProperty(value = "鏈堝垎缁勫悕绉�" ,hidden = true)
+ @TableField(exist = false)
+ private String groupName ;
+ @ApiModelProperty(value = "鏈堝垎缁勭紪鐮�" ,hidden = true)
+ @TableField(exist = false)
+ private Integer groupId ;
+ @ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
+ @TableField(exist = false)
+ private Date doneDate;
+ @ApiModelProperty(value = "鎵胯繍鍗曞彿", example = "1")
+ @TableField(exist = false)
+ private String carryBillCode;
+
+ @ApiModelProperty(value = "鍚堝悓鍙穈")
+ @ExcelColumn(name="鍚堝悓鍙穈")
+ private String contractNum;
+
}
--
Gitblit v1.9.3