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

jinpengyong

2023-11-15 84e740f362d574b942b1c9a274425841c9167de8

 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;