From 4d78c837e336bca9d56e9fc10b268b11b68229f8 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 26 二月 2024 11:33:05 +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 |    6 +++++-
 1 files changed, 5 insertions(+), 1 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..0d17ae7 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;

--
Gitblit v1.9.3