From 3c8fe245e9b43b372eaa8a1bbbb27e5cd4988fe1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 26 三月 2025 16:48:29 +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 | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 7146dfe..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;
@@ -244,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 = "鍔冲姟璁垮鐢宠闅忚浜哄憳")
@@ -261,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)
@@ -306,6 +312,18 @@
@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