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

gongchunyi

22 小时以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

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

    private Long productModelId;

}