Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812

cjl

2023-08-18 239927b057f65a040594f7a4cb08c8881b303797

 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;