From 2d2ac91d76af6ef4d755555c7623ee4e016a3066 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 29 九月 2024 15:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java | 11 ++++++++++-
1 files changed, 10 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 6abd296..f4d58da 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
@@ -47,14 +47,23 @@
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
+ @ApiModelProperty(value = "0鏈畬鎴� 1宸插畬鎴� 2宸插彇娑�", example = "1")
+ @ExcelColumn(name="鐘舵�� 0鏈畬鎴� 1宸插畬鎴� 2宸插彇娑�")
+ private Integer status;
+ @ApiModelProperty(value = "涓婇攣鐘舵�� 0鏈笂閿� 1宸蹭笂閿�", example = "1")
+ @ExcelColumn(name="涓婇攣鐘舵�� 0鏈笂閿� 1宸蹭笂閿�")
+ private Integer lockStatus;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "琛屾暟鎹紪鐮侊紙鍏宠仈platform_wms_job)", example = "1")
+ @ApiModelProperty(value = "琛屾暟鎹紪鐮侊紙鍏宠仈platform_job)", example = "1")
@ExcelColumn(name="琛屾暟鎹紪鐮侊紙鍏宠仈platform_wms_job)")
private Integer jobId;
+ @ApiModelProperty(value = "琛屾暟鎹紪鐮侊紙鍏宠仈platform_wms_job)", example = "1")
+ @ExcelColumn(name="琛屾暟鎹紪鐮侊紙鍏宠仈platform_wms_job)")
+ private Integer wmsJobId;
@ApiModelProperty(value = "閫氱煡鍗曞彿")
@ExcelColumn(name="閫氱煡鍗曞彿")
--
Gitblit v1.9.3