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

maven

17 小时以前 55c4143362c7df1ece4523597e26947d35e21bda

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

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

    private Long productModelId;// 基础产品ID

}