From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 27 三月 2025 16:47:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 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 2aad579..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 @@ -77,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; @@ -98,7 +100,12 @@ @ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級") @TableField(exist = false) private Date doneDate; - @ApiModelProperty(value = "璁″垝鏀惰揣鏁伴噺(闈瀢ms)", example = "1") + @ApiModelProperty(value = "鎵胯繍鍗曞彿", example = "1") @TableField(exist = false) - private BigDecimal ortherIoQty; + private String carryBillCode; + + @ApiModelProperty(value = "鍚堝悓鍙穈") + @ExcelColumn(name="鍚堝悓鍙穈") + private String contractNum; + } -- Gitblit v1.9.3