Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro

yuan

2026-05-20 d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1

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

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

    private Long count;

    private String statusName;
}