Merge branch 'cjl' into qa

cjl

2023-10-07 8b5439ba2748f91720975f73e7479a751d6a452b

 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;