From 4450dd41e8d5828e5da4d277c86e54551a6b6c15 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Dec 2021 09:06:28 +0800
Subject: [PATCH] 设备新增,修改是工艺字段可以为多个,修改mapper,sql

---
 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