Merge remote-tracking branch 'origin/wb' into qa

cjl

2023-09-27 3bbf11c99f594a2757f601fa3c680917cea33c17

 screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationQueryDTO.java

@@ -18,7 +18,7 @@

    private String msg;

    private long page;
    private long pages;

    private long total;