Browse Source

Merge remote-tracking branch 'origin/dev' into test

wanghui 8 years ago
parent
commit
d241aeabf0

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -118,7 +118,7 @@ public class UserRegisterController extends BaseController {
 			us.setAid("2");//ID为"2"的管理员
 			userService.insertRegister(us,companyName,contacts);
 			User u1 = userService.selectByPrimaryKey(us.getId()); 			
-			if(StringUtils.isNoneBlank(uuid))registerEasemobAfterRegister(uuid,u1);//开通环信账号
+			registerEasemobAfterRegister(uuid,u1);//开通环信账号
 		}
 		
 		return res;