Merge branch 'jtwy' into dev_New

zss

14 小时以前 fc830b7f62af651acedb8c11f1e2634fe2a3e497

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

@@ -16,10 +16,11 @@
    private String nickName;

    /**
     * 入库类型 1-采购 2-生产
     * 入库类型 1-采购 2-生产 3-自定义
     */
    private Integer type;

    private String typeName;
    private Integer purchaseLedgerId;

}