Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-07-15 8a1e35934f5ad3e3febe6168e8eb990a0cd9cadb

 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;