Merge branch 'cjl' into qa

cjl

2023-08-23 69211d8ad298564f35ac9fa3bd63a6e10dc27077

 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;