From 1519d4a21f845f1516883974475db19476d1200c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 九月 2024 11:49:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index d9c8c84..875c590 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -303,6 +303,9 @@
@TableField(exist = false)
private String platformName ;
+ @ApiModelProperty(value = "WMS浠诲姟鏃堕棿")
+ @TableField(exist = false)
+ private String ioCreatedate;
@ApiModelProperty(value = "绂诲満涓嬪彂鎿嶄綔浜哄悕绉�", example = "1")
@TableField(exist = false)
@@ -355,14 +358,33 @@
@TableField(exist = false)
private Integer jobType;
- @ApiModelProperty(value = "寮�濮嬩换鍔℃椂闂磋捣")
+ @ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂磋捣")
@TableField(exist = false)
private Date beginWorkDateStart;
- @ApiModelProperty(value = "寮�濮嬩换鍔℃椂闂存")
+ @ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂存")
@TableField(exist = false)
private Date beginWorkDateEnd;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿璧�")
+ @TableField(exist = false)
+ private Date createDateStart;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿姝�")
+ @TableField(exist = false)
+ private Date createDateEnd;
+
+ @ApiModelProperty(value = "鏈堝彴缁勫悕绉�")
+ @TableField(exist = false)
+ private String platformGroupName ;
+
+ @ApiModelProperty(value = "鏈堝彴宸ヤ綔鏃堕暱" ,hidden = true)
+ @TableField(exist = false)
+ private BigDecimal workTimes ;
+
+
+
@ApiModelProperty(value = "澶氱姸鎬佹煡璇� 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
private String queryStatus;
--
Gitblit v1.9.3