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

王佳豪

2021-06-01 391ea14026d1fe6417d4ce88ebedc6654b6519ad

 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;
    }