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

云

2 天以前 23c8604bc54ba3f20b0bf00a2649895c8e096a05

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