Merge remote-tracking branch 'origin/develop' into develop

bocloud.sms.service/src/main/java/com/bocloud/sms/service/TrxServiceImpl.java

@@ -146,7 +146,7 @@ public class TrxServiceImpl implements TrxService {
             log.error("用户登录失败：", e);
             return new GeneralResult(false, "用户登录失败" + e.getMessage());
         }
-        return new GeneralResult(true, login, "用户登录成功");
+        return login;
     }
 
     private void saveUserByTrx(String userId) {