Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java

@@ -217,7 +217,7 @@
               UserAccountBindingHistory.TYPE_PHONE);

         // 手机号更换绑定的7天内不能提现

         if (history != null && !history.getFirst()

               && (System.currentTimeMillis() - history.getCreateTime().getTime()) > 1000 * 60 * 60 * 24 * 7L) {

               && (System.currentTimeMillis() - history.getCreateTime().getTime()) < 1000 * 60 * 60 * 24 * 7L) {

            throw new AlipayAccountException(111, "修改手机号7天内不允许修改支付宝账号");

         }

      }