From 06b00a178d194d33370e44410c4f04a4164f86c7 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 24 Jun 2021 14:07:02 +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