Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-05 b63c28a0c24782753eae26892171dd1a0c8d1fe7

 fanli/src/main/java/com/yeshi/fanli/controller/client/SMSController.java

@@ -86,6 +86,7 @@
         return;

      }

      phone = phone.replaceAll(" ", "");

		
      sendMSNnew(phone,slideVerify, 1, StringUtil.Md5(phone + "-" + acceptData.getDevice()), out);

   }