Merge branch 'feature/1019-tenant' into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumCategoryServiceImpl.java

@@ -161,7 +161,8 @@ public class TenantAlbumCategoryServiceImpl extends ServiceImpl<TenantAlbumCateg
         if (names.size() != values.size()) {
             TenantAlbumCategory albumCategory = this.getById(tenantAlbumCategory.getId());
             ETenantAlbumCategoryType categoryType = albumCategory.getCategoryType();
-            throw new BizException(ETenantAlbumCategoryType.CATEGORY_TYPE.equals(categoryType) ? "类型不能有重复" : "级别不能有重复");
+            throw new BizException(ETenantAlbumCategoryType.CATEGORY_TYPE.equals(categoryType) ? "类型不允许有重复" :
+                    "级别不允许有重复");
         }
 
         // 校验是否存在引用删除