Merge branch 'jtwy' into dev_New

zss

5 小时以前 fc830b7f62af651acedb8c11f1e2634fe2a3e497

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

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

    private Long productModelId;// 基础产品ID

}