Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-24 52f100ec7860c781c1b44259c6c54b221a30c100

 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;