Merge branch 'feature/0925_opt' into develop

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -197,7 +197,7 @@ public class TenantAlbumController {
             List<Long> musicIds = album.getMusicSheetData().stream().flatMap(o -> o.getMusicSheetList().stream().map(m -> m.getId())).collect(Collectors.toList());
             Set<Long> musicSet = new HashSet<>(musicIds);
             if (musicSet.size() < musicIds.size()) {
-                throw new BizException("不予许添加相同的曲目");
+                throw new BizException("不能添加相同的曲目");
             }
         }
 
@@ -246,7 +246,7 @@ public class TenantAlbumController {
                     .stream().map(TenantAlbumVo.MusicObject::getId)).collect(Collectors.toList());
             Set<Long> musicSet = new HashSet<>(musicIds);
             if (musicSet.size() < musicIds.size()) {
-                throw new BizException("不予许添加相同的曲目");
+                throw new BizException("不能添加相同的曲目");
             }
         }
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenTenantController.java

@@ -74,12 +74,13 @@ public class OpenTenantController {
         // 根据手机号 判断是否已经有机构账户
         TenantStaff tenantStaff = tenantStaffService.getByPhone(phone);
         if (tenantStaff != null) {
-            return HttpResponseResult.status(true);
+            return HttpResponseResult.succeed(true);
         }
-        return HttpResponseResult.status(false);
+        return HttpResponseResult.succeed(false);
     }
 
 
+
     @GetMapping("/bindWechat")
     @ApiOperation(value = "绑定微信")
     public HttpResponseResult<Boolean> bindWechat(@RequestParam("phone") String phone,