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

liyong

16 小时以前 8f5be003e52fdbf034d1955216143bd184ebbdb4

 yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/dataobject/category/MdmItemCategoryDO.java

@@ -53,6 +53,11 @@
    private Integer itemType;

    /**
     * 物料/产品标识(兼容MES: ITEM/PRODUCT)
     */
    private String itemOrProduct;

    /**
     * 排序
     */
    private Integer sort;