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

liyong

6 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

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

@@ -17,6 +17,13 @@

    private Integer userId;

    private Integer salesLedgerProductId;
    private Long salesLedgerProductId;

    /**
     * 出库类型 1-采购出库 2-销售出库 3-自定义
     */
    private Integer type;

    private Long productModelId;// 基础产品ID

}