Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-25 5ca8157adb3236d7817b487a5ff6f4efa12006d2

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -242,8 +242,6 @@
   

   @Resource

   private RedPackForbidService redPackForbidService;







   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";