forked from moral

blame | history | patch | commit | commitdiff | ignore whitespace
kaiyu
2021-05-11 0e48cd386385110ea16ca05aae070f013c221f9a 
 screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationQueryVO.java


@@ -87,7 +87,6 @@


        vo.setCreateTime(createTimeStr);


        vo.setExpireTime(exipreTimeStr);


        vo.setAdminUserId(organization.getAdminUserId());


        vo.setAdminUserAccount(adminUser.getAccount());


        vo.setProvinceCode(organization.getProvinceCode());


        vo.setCityCode(organization.getCityCode());


        vo.setAreaCode(organization.getAreaCode());


@@ -108,6 +107,7 @@


            adminUserVO.setCreateTime(adminUserCreateTimeStr);


            adminUserVO.setUserName(adminUser.getUserName());


            adminUserVO.setOrganizationName(organization.getName());


            vo.setAdminUserAccount(adminUser.getAccount());


            vo.setAdminUser(adminUserVO);


        }else{


            vo.setAdminUser(new UserVO());