Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

2026-06-24 11e7ea2839eebe94d3f666d33429b13967feb164

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