Merge branch 'jtwy' into dev_New

zss

23 小时以前 1493f69da9d12415085c9be7937d4f394c5fb154

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

@@ -15,4 +15,12 @@

    private String nickName;

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

    private String typeName;
    private Integer purchaseLedgerId;

}