Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantUnbindHistoryWrapper.java

@@ -78,7 +78,7 @@ public class TenantUnbindHistoryWrapper {
         @ApiModelProperty("机构员工")
         private String tenantUserName;
 
-        @ApiModelProperty("机构员工")
+        @ApiModelProperty("机构员工手机号")
         private String tenantPhone;
 
         @ApiModelProperty("用户ID")
@@ -88,7 +88,6 @@ public class TenantUnbindHistoryWrapper {
         private String userName;
 
         @ApiModelProperty("手机号")
-        @TableField(value = "phone_")
         private String phone;
 
         @ApiModelProperty("用户类型")

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -798,7 +798,7 @@
     <select id="countByUser" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetUploadCountVo">
         select user_id_ userId, count(id_) count
         from music_sheet
-        where del_flag_ = false and user_id_ in
+        where del_flag_ = false and state_ =1 and user_id_ in
         <foreach collection="userIds" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>

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

@@ -181,7 +181,7 @@ public class TenantInfoController extends BaseController {
 
             boolean exists = smsCodeService.verifyValidCode(sysUser.getPhone(), sysUser.getCode(), "PHONE");
             if (Boolean.FALSE.equals(exists)) {
-                throw new BizException("手机号校验有误");
+                throw new BizException("验证码错误");
             }
 
             long userId;