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

gongchunyi

昨天 0adbf58fd15052d8a044cf66eaa8afaa8591ba74

 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java

@@ -192,4 +192,6 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate endDate;

    private Long productModelId;

}