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

cjl

2023-09-28 187277124baa4bd68bee8133fd158aea95c5bd6b

 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;