From af3434a79c2a096105668273cfa27c09eacf6ff1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 30 九月 2024 09:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 0871a62..fdac02c 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
@@ -287,6 +287,10 @@
@ExcelColumn(name="纭浠诲姟鏃堕棿")
private Date confirmTaskDate;
+ @ApiModelProperty(value = "绛惧埌搴忓彿", example = "1")
+ @ExcelColumn(name="绛惧埌搴忓彿")
+ private Integer signNum;
+
@ApiModelProperty(value = "鏈�鏂板彨鍙锋椂闂�")
@TableField(exist = false)
private Date newCallDate;
@@ -310,6 +314,12 @@
@ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О")
@TableField(exist = false)
private String platformName ;
+
+
+ @ApiModelProperty(value = "浣滀笟閲�" ,hidden = true)
+ @TableField(exist = false)
+ private BigDecimal workNum ;
+
@ApiModelProperty(value = "WMS浠诲姟鏃堕棿")
@TableField(exist = false)
@@ -393,12 +403,18 @@
@TableField(exist = false)
private BigDecimal workTimes ;
-
+ @ApiModelProperty(value = "甯傚叕鍙歌溅棰勭害璁板綍")
+ @TableField(exist = false)
+ private Integer bookId;
@ApiModelProperty(value = "澶氱姸鎬佹煡璇� 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
private String queryStatus;
+ @ApiModelProperty(value = "浣滀笟绫诲瀷鏌ヨ 澶氫釜浠�,鍒嗗壊")
+ @TableField(exist = false)
+ private String queryType;
+
@ApiModelProperty(value = "鐢靛瓙閿佺姸鎬侊細0=鏈笂閿� 1=涓嶅垎涓婇攣 2=鍏ㄩ儴涓婇攣")
@TableField(exist = false)
private Integer lockStatus;
--
Gitblit v1.9.3