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

zss

2 天以前 2be29256f04c9822dc793c75dfae16c3262d2faf

 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;

}