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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java

@@ -929,10 +929,7 @@
         redisManager.clearSMSVCode(phone, SMSHistory.TYPE_REMVOE);

      }

      

      UserInfo user = new UserInfo(uid);

      user.setState(UserInfo.STATE_DELETE);

      user.setStateDesc("用户主动注销账户");

      userInfoService.updateByPrimaryKeySelective(user);

      userAccountService.forbiddenUserAll(uid, "用户主动注销账户");

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("注销成功"));

   }