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

liyong

22 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

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

@@ -24,4 +24,6 @@
     */
    private Integer type;

    private Long productModelId;// 基础产品ID

}