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

cjl

2023-07-10 6344a8b6b7e2853dbfa9e6506ff2e17a31930297

 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;