Merge branch 'jtwy' into dev_New

zss

10 天以前 d972907df11fa76d5766e9aed7f0d36488310d99

 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;

}