Merge branch 'master_activity' into base-modify

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/WeixinController.java

@@ -57,7 +57,7 @@ public class WeixinController {
      * @param callback
      * @return
      */
-    @GetMapping(value = "/userInfo")
+    @GetMapping(value = "/app/unauth/userInfo")
     public String getUserInformation(String code, String callback, HttpServletRequest request) {
         log.info("-----微信回调userInfo---code=="+code+"----redirec_url==="+callback);
         if (StringUtils.isNotBlank(code)){