From fad0704afaf4ed07963d267142cc6f625a09909d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 六月 2026 18:32:05 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
index 03ae864..249db47 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -43,7 +43,8 @@
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
-
+ @ApiModelProperty(value = "濮撳悕鎷奸煶棣栧瓧姣�")
+ private String pinyin;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@@ -156,6 +157,20 @@
@ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
private Date fsDate;
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴缁勭粐")
+ private Integer relationCompanyId;
+
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴浜哄憳")
+ private Integer relationUserId;
+
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String relationCompanyName;
+
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴浜哄憳鍚嶇О")
+ @TableField(exist = false)
+ private String relationUserName;
+
@ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
@TableField(exist = false)
private String categoryName;
--
Gitblit v1.9.3