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

jinpengyong

2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56

 screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountQueryDTO.java

@@ -26,6 +26,6 @@

    private long size;

    private List<AccountDTO> AccountDTOS;
    private List<AccountDTO> accountDTOS;

}