From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
index fe584b5..d2e850f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
@@ -65,8 +65,8 @@
@ExcelColumn(name="鍏ュ簱绫诲瀷",index = 7,width = 12,valueMapping = "0=鏁存墭鐩�;1=浠剁儫;")
private Integer inType;
- @ApiModelProperty(value = "鎬昏繍杈撻噺", example = "1")
- @ExcelColumn(name="鎬昏繍杈撻噺",index = 2,width = 12)
+ @ApiModelProperty(value = "鎬讳綔涓氶噺(涓囨敮)", example = "1")
+ @ExcelColumn(name="鎬讳綔涓氶噺(涓囨敮)",index = 2,width = 12)
private BigDecimal totalNum;
@ApiModelProperty(value = "鍓嶈溅鐗屽彿")
@@ -97,6 +97,8 @@
@ApiModelProperty(value = "鍏ュ洯鍘熷洜")
@ExcelColumn(name="鍏ュ洯鍘熷洜",index = 1,width = 12)
private String inReason;
+
+
@ApiModelProperty(value = "鍏ュ洯鍘熷洜涓婚敭")
private Integer reasonId;
@@ -139,6 +141,14 @@
@TableField(exist = false)
private String auditTime;
+ @ApiModelProperty(value = "閫氱煡鎻忚堪")
+ @TableField(exist = false)
+ private String info;
+
+ @ApiModelProperty(value = "浣滀笟璁板綍鐘舵��: 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�")
+ @TableField(exist = false)
+ private Integer jobStatus;
+
@ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
@TableField(exist = false)
private ApproveDataVO approveDateVO;
--
Gitblit v1.9.3