Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/szwl/controller/WxLoginController.java

src/main/java/com/szwl/controller/WxLoginController.java

@@ -41,7 +41,7 @@ public class WxLoginController {
     @Value("${oauth.wx.appsecret}")
     private String appsecret;
 
-    @Value("${oauth.callback.http:http://szwltest.sunzee.com.cn}")
+    @Value("${oauth.callback.http}")
     private String http;
 
     @ApiOperation(value = "用户默认授权")