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

liyong

3 天以前 1765150bd38a53f6466a6e355f231e21f25fc9f2

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

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

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

    private String typeName;
    private Integer purchaseLedgerId;
    private Long qualityInspectId;

}