From cb1794d34ab60176dd6e62c451a47774c5d9552f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 一月 2025 13:43:12 +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/Visits.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 5c3e688..7f3b755 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -2,7 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.business.vo.ApproveDataVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -144,8 +145,8 @@
@ExcelColumn(name="鎺ュ緟浜哄憳")
private Integer receptMemberId;
- @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�", example = "1")
- @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�")
+ @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂� 9宸插け鏁�", example = "1")
+ @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂� 9宸插け鏁�")
private Integer status;
@ApiModelProperty(value = "鍒濆浜虹紪鐮�", example = "1")
@@ -219,6 +220,9 @@
@ExcelColumn(name="ERP鐢宠璁板綍缂栫爜")
private String erpId;
+ @ApiModelProperty(value = "鏄惁鍙戦�佽秴鏃堕�氱煡 0锛氭湭鍙戦�侊紱1=宸插彂閫�")
+ private Integer sendTimeOutNotice;
+
@ApiModelProperty(value = "缁熻鏁伴噺 ")
@TableField(exist = false)
@@ -241,7 +245,7 @@
// @ApiModelProperty(value = "鐝")
// private String memberClasses;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
@TableField(exist = false)
private Integer memberType;
@ApiModelProperty(value = "鍔冲姟璁垮鐢宠闅忚浜哄憳")
@@ -258,6 +262,11 @@
@ExcelColumn(name="琚浜哄憳濮撳悕")
@TableField(exist = false)
private String receptMemberName;
+
+ @ApiModelProperty(value = "琚浜哄憳鐢佃瘽", example = "1")
+ @ExcelColumn(name="琚浜哄憳鐢佃瘽")
+ @TableField(exist = false)
+ private String receptMemberMobile;
@ApiModelProperty(value = "琚浜哄憳娴峰悍缂栫爜", example = "1")
@ExcelColumn(name="琚浜哄憳濮撳悕")
@TableField(exist = false)
@@ -294,10 +303,27 @@
@TableField(exist = false)
private Integer levelStatus;
+ @ApiModelProperty(value = "涓氬姟瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 ", example = "1")
+ @TableField(exist = false)
+ private Integer businessStatus;
+
+
@ApiModelProperty(value = "鍒涘缓浜哄鍚�", example = "1")
@TableField(exist = false)
private String createMemberName;
+ @ApiModelProperty(value = "鍒涘缓浜虹數璇�", example = "1")
+ @TableField(exist = false)
+ private String createMobile;
+
+ @ApiModelProperty(value = "鍚庣鍒涘缓浜�", example = "1",hidden = true)
+ @TableField(exist = false)
+ private LoginUserInfo loginUserInfo;
+
+ @ApiModelProperty(value = "閫氱煡鎻忚堪")
+ @TableField(exist = false)
+ private String info;
+
@ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
@TableField(exist = false)
private ApproveDataVO approveDateVO;
--
Gitblit v1.9.3