Merge branch 'master' of https://gitee.com/luxiaotao1123/wms-cloud into master

luxiaotao1123

2021-04-06 6f39c0f9356f6c7e6fe80c4c99f1419b19be7e5e

 src/main/java/zy/cloud/wms/manager/entity/Mat.java

@@ -268,7 +268,7 @@
        TagService service = SpringUtils.getBean(TagService.class);
        Tag tag = service.selectById(this.tagId);
        if (!Cools.isEmpty(tag)){
            return String.valueOf(tag.getId());
            return String.valueOf(tag.getName());
        }
        return null;
    }