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

cjl

2023-07-21 3b4574cf01b839bdac2ef5647a106185d709dd71

 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;