Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -76,7 +76,7 @@
         ON DUPLICATE KEY UPDATE user_id_ = VALUES(user_id_)
     </insert>
     <insert id="saveStudent">
-        INSERT INTO student (user_id_,create_time_,update_time_) VALUES(#{userId},NOW(),NOW())
+        INSERT INTO student (user_id_,create_time_,update_time_,hide_flag_) VALUES(#{userId},NOW(),NOW(),0)
         ON DUPLICATE KEY UPDATE user_id_ = VALUES(user_id_)
     </insert>
 

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

@@ -273,7 +273,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
         } else {
             sysUser = new SysUser();
             sysUser.setPhone(tenantInfo.getPhone());
-            sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+            sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.TEACHER_AVATAR));
             sysUser.setUserType(SysUserType.ORGANIZATION.getCode());
             sysUser.setUsername(tenantInfo.getUsername());
             String newPassword = MessageFormat.format("klxjg{0}", tenantInfo.getPhone().substring(7));