From 5464bf2beb3f07a6f3843f88df887f95cbe983af Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 06 一月 2026 17:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/java/com/doumee/dao/business/model/Member.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
index a5ccb0d..34f2674 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -231,7 +231,7 @@
private String companyPath;
@ApiModelProperty(value = "缁勭粐淇℃伅")
@TableField(exist = false)
- private Company company;
+ private Company companyModel;
@ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
@TableField(exist = false)
private Integer headId;
--
Gitblit v1.9.3