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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

 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;