Merge branch 'wei_master' into '105'

Wei master

See merge request !39

src/main/java/com/server/web/controller/UserController.java

@@ -171,7 +171,7 @@ public class UserController extends BaseController {
 
 
                 //测试用,上线去掉
                 //测试用,上线去掉
                 System.out.println(phone + "999微信注册登录验证码为:" + randomCode);
                 System.out.println(phone + "999微信注册登录验证码为:" + randomCode);
-                resultMap.put("data", randomCode);// FIXME: WWF 2020/3/13上线前去掉验证码
+                resultMap.put("data", "");
                 resultMap.put("status", "1");
                 resultMap.put("status", "1");
                 resultMap.put("message", "发送成功~");
                 resultMap.put("message", "发送成功~");
             } else {
             } else {