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

liyong

23 小时以前 b9d7eb36481c3ac327f85a38dab1cbee1163be40

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

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

    private Long productModelId;

}