From 43e5052b91f0568ccbcf3fd6df70cf8209db184a Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Fri, 28 May 2021 17:36:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java index e7b89c7..766d33a 100644 --- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java +++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java @@ -47,6 +47,8 @@ private String wechat; + private String adminUserAccount; + private String expireTime; private String createTime; -- Gitblit v1.8.0