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

liyong

5 天以前 f5624a59380db70633eebe3612e2d3c703012b41

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

@@ -15,4 +15,11 @@

    private String nickName;

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

    private String typeName;

}