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

zss

昨天 40946ba6c24a0318f14cbed603f0ed9cad1da853

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

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

    private Long productModelId;// 基础产品ID

}