Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-05-25 aecc6316d0a6bcb3119dc062106deb5a57cdd790

 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;