From b399e7f0b4a27443ebd6edb9ed6ae6111bcd31ee Mon Sep 17 00:00:00 2001
From: pengsz <pengsz@iesaylink.com>
Date: Tue, 9 Dec 2025 10:55:46 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20=E7=94=A8=E6=88=B7=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yzt/admin/controller/UserController.java  |  2 +-
 .../java/com/yzt/common/request/UserCreateRequest.java |  4 ++++
 .../java/com/yzt/common/request/UserUpdateRequest.java |  4 ++++
 .../main/java/com/yzt/service/service/UserService.java |  2 +-
 .../com/yzt/service/service/impl/UserServiceImpl.java  | 10 +++++-----
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java b/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java
index 64f61bd..35d39b0 100644
--- a/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java
+++ b/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java
@@ -123,7 +123,7 @@ public class UserController {
     @PreAuthorize("hasAuthority('admin:user:info')")
     @ApiOperation(value = "详情")
     @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<UserCenterResponse> info(@RequestParam(value = "id") Integer id) {
+    public CommonResult<UserResponse> info(@RequestParam(value = "id") Integer id) {
         return CommonResult.success(userService.getByUid(id));
     }
 
diff --git a/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java
index 01eb99a..184f461 100644
--- a/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java
+++ b/fightwine-common/src/main/java/com/yzt/common/request/UserCreateRequest.java
@@ -83,6 +83,10 @@ public class UserCreateRequest implements Serializable {
 //    @ApiModelProperty(value = "等级")
 //    private Integer level;
 
+
+    @ApiModelProperty("用户公司名称")
+    private String companyName;
+
     @ApiModelProperty(value = "用户分组id")
     private String groupId;
 
diff --git a/fightwine-common/src/main/java/com/yzt/common/request/UserUpdateRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/UserUpdateRequest.java
index e9ed664..4e4467c 100644
--- a/fightwine-common/src/main/java/com/yzt/common/request/UserUpdateRequest.java
+++ b/fightwine-common/src/main/java/com/yzt/common/request/UserUpdateRequest.java
@@ -82,6 +82,10 @@ public class UserUpdateRequest implements Serializable {
     @ApiModelProperty(value = "用户标签id")
     private String tagId;
 
+
+    @ApiModelProperty("用户公司名称")
+    private String companyName;
+
 //    @ApiModelProperty(value = "是否为推广员")
 //    @NotNull(message = "是否为推广员不能为空")
 //    private Boolean isPromoter;
diff --git a/fightwine-service/src/main/java/com/yzt/service/service/UserService.java b/fightwine-service/src/main/java/com/yzt/service/service/UserService.java
index 6e4f0fc..bb640c2 100644
--- a/fightwine-service/src/main/java/com/yzt/service/service/UserService.java
+++ b/fightwine-service/src/main/java/com/yzt/service/service/UserService.java
@@ -272,7 +272,7 @@ public interface UserService extends IService<User> {
      * @param uid id
      * @return 用户信息
      */
-    UserCenterResponse getByUid(Integer uid);
+    UserResponse getByUid(Integer uid);
 
     /**
      * 根据手机号查询用户
diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java
index c62fd72..13a8591 100644
--- a/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java
+++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java
@@ -1650,14 +1650,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      * @return 用户信息
      */
     @Override
-    public UserCenterResponse getByUid(Integer uid) {
+    public UserResponse getByUid(Integer uid) {
         LambdaQueryWrapper<User> lqw = new LambdaQueryWrapper<>();
         lqw.eq(User::getUid, uid);
         User user = userMapper.selectOne(lqw);
-        UserCenterResponse userCenterResponse = new UserCenterResponse();
-        BeanUtils.copyProperties(user,userCenterResponse);
-        userCenterResponse.setTenantName(tenantService.getInfo(user.getTenantId()).getTenantName());
-        return userCenterResponse;
+        UserResponse userResponse = new UserResponse();
+        BeanUtils.copyProperties(user,userResponse);
+        userResponse.setTenantName(tenantService.getInfo(user.getTenantId()).getTenantName());
+        return userResponse;
     }
 
     @Override