From e3098cf8d9d710e8f4b82ec029049854dfe76ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com>
Date: Mon, 6 Jun 2022 19:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E=E5=B7=A5?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/controller/admin/auth/AuthController.java     | 2 +-
 .../system/controller/admin/auth/vo/auth/AuthLoginRespVO.java   | 2 +-
 .../yudao/module/system/dal/dataobject/CpUser/CpUserDO.java     | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
index d761ccf8..a70dde73 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
@@ -112,7 +112,7 @@ public class AuthController {
                 .platform("wxcp")
                 .build();
         String token = authService.login(login, getClientIP(), getUserAgent());
-        AuthLoginRespVO vo = AuthLoginRespVO.builder().token(token).user(user).build();
+        AuthLoginRespVO vo = AuthLoginRespVO.builder().token(token).user(cpuser).build();
         return CommonResult.success(vo);
     }
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthLoginRespVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthLoginRespVO.java
index ec3aca93..840e946e 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthLoginRespVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthLoginRespVO.java
@@ -19,5 +19,5 @@ public class AuthLoginRespVO {
     @ApiModelProperty(value = "token", required = true, example = "zsw")
     private String token;
 
-    private AdminUserDO user;
+    private CpUserDO user;
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/CpUser/CpUserDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/CpUser/CpUserDO.java
index 042f9216..48f37559 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/CpUser/CpUserDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/CpUser/CpUserDO.java
@@ -62,4 +62,6 @@ public class CpUserDO extends BaseDO {
      */
     private String bizMail;
 
+    private Integer workHour;
+
 }