From 39ddb6cdeefad6489e79cd49dfa94fdaf359dcdc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 20 五月 2024 16:57:10 +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 | 12 ++++--------
1 files changed, 4 insertions(+), 8 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 ec899e7..077a8ad 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,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -22,7 +23,7 @@
@Data
@ApiModel("璁垮鐢宠淇℃伅琛�")
@TableName("`visits`")
-public class Visits {
+public class Visits extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -69,24 +70,19 @@
@ApiModelProperty(value = "鍋ュ悍鐮�")
@ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
-
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� ", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� ")
+ @ApiModelProperty(value = "绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ", example = "1")
+ @ExcelColumn(name="绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ")
private Integer type;
-
@ApiModelProperty(value = "璁垮鍚嶇О")
@ExcelColumn(name="璁垮鍚嶇О")
private String name;
-
@ApiModelProperty(value = "璁垮骞撮緞")
@ExcelColumn(name="璁垮骞撮緞")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
-
@ApiModelProperty(value = "鎵嬫満鍙�")
@ExcelColumn(name="鎵嬫満鍙�")
private String phone;
-
@ApiModelProperty(value = "浼佷笟鍚嶇О")
@ExcelColumn(name="浼佷笟鍚嶇О")
private String companyName;
--
Gitblit v1.9.3