From 92f94b0a4e65b0ab5c4195e632b5e4d1b0158aac Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 28 二月 2024 12:03:26 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index d585a36..ce884ad 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -201,12 +201,16 @@
@ExcelColumn(name="ERP缁勭粐缂栫爜")
private String erpOrgId;
+ @ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
+ @ExcelColumn(name="璁垮鍏徃鍚嶇О")
+ private String visitCompanyName;
+
@ApiModelProperty(value = "缁勭粐鍚嶇О")
@TableField(exist = false)
private String companyName;
@ApiModelProperty(value = "缁勭粐娴峰悍缂栫爜")
@TableField(exist = false)
- private String companyHkId;
+ private String hkOrgId;
@ApiModelProperty(value = "瑙掕壊缂栫爜鏌ヨ")
@TableField(exist = false)
private String roleIdParam;
@@ -229,7 +233,6 @@
private Integer visitTimes;
@ApiModelProperty(value = "鏈�鍚庤闂椂闂�")
- @TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastVisitDate;
--
Gitblit v1.9.3