Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸

gaoluyang

2026-09-24 a3d3ba426c2a5a6015888d5e32e0f9704b4d125c

 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;
}