From a1647a5152e3d368ec2fb738ca7cc858e220d06c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 九月 2024 09:15:08 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java
index e07bf62..f3b22db 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.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;
@@ -9,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁
@@ -31,7 +33,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +42,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -81,8 +83,7 @@
@ApiModelProperty(value = "閫氱煡鍒涘缓鏃ユ湡")
@ExcelColumn(name="閫氱煡鍒涘缓鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date ioCreatedate;
+ private String ioCreatedate;
@ApiModelProperty(value = "鐘舵�� 0鏈鐞� 1宸插鐞� 2宸插彇娑�", example = "1")
@ExcelColumn(name="鐘舵�� 0鏈鐞� 1宸插鐞� 2宸插彇娑�")
@@ -90,7 +91,7 @@
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
@ExcelColumn(name="鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date cancelDate;
@ApiModelProperty(value = "鍙栨秷澶囨敞")
@@ -108,5 +109,11 @@
@ApiModelProperty(value = "鍚堝悓鍙穈")
@ExcelColumn(name="鍚堝悓鍙穈")
private String contractNum;
+ @ApiModelProperty(value = "鏄惁鏂版暟鎹甡")
+ @TableField(exist = false)
+ private int isNew;
+ @ApiModelProperty(value = "鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�")
+ @TableField(exist = false)
+ private List<PlatformWmsDetail> platformWmsDetailList;
}
--
Gitblit v1.9.3