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

yaowanxin

2 天以前 973677d7792dbe440bd032ff4cc138458c89b06e

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

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

    private Long productModelId;// 基础产品ID

}