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

gongchunyi

昨天 0adbf58fd15052d8a044cf66eaa8afaa8591ba74

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

@@ -15,4 +15,13 @@

    private String nickName;

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

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

}