Merge branch 'dev_New_pro' into dev_山西_黎城康森商砼

云

2026-07-08 92eb695ac1254708feb6e740432fc5da9e1ad42b

 src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingUseVo.java

@@ -16,4 +16,6 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date meetingDate;

    private String date;
}