From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
index 501c78f..11ad7c3 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
@@ -63,7 +63,7 @@
public static AccountVO convertToQueryPage(AccountDTO dto) {
if (dto.getAccount() == null)
return null;
- AccountInsertVO vo = new AccountInsertVO();
+ AccountVO vo = new AccountVO();
ManageAccount account = dto.getAccount();
List<ManageRole> roles = dto.getRoles();
if(!ObjectUtils.isEmpty(roles)){
@@ -75,6 +75,7 @@
});
}
vo.setId(account.getId());
+ vo.setAccount(account.getAccount());
vo.setUserName(account.getUserName());
vo.setEmail(account.getEmail());
vo.setMobile(account.getMobile());
--
Gitblit v1.8.0