Merge branch 'jtwy' into dev_New

zss

19 小时以前 2757f1d46f388f684aad93b3dc7ad805c45c6248

 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;

}