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

jinpengyong

2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56

 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;