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

zss

9 天以前 0629abbc318d5f78d2e91b45e4526d35a4ed8115

 src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java

@@ -8,4 +8,6 @@
    private String CreateUserName;

    private Long count;

    private String statusName;
}