Merge remote-tracking branch 'origin/dev' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -445,8 +445,4 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         return zero;
     }
 
-    public static void main(String[] args) {
-        StringBuffer stringBuffer = new StringBuffer("We Are Happy");
-    }
-
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/UserBiz.java

@@ -97,7 +97,7 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
             log.info("----code为空---");
             throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("code为空"));
         }
-        String openid = "oXDd91N8Rwijd3gscAND9TO77a2I";
+        String openid = "oXDd91MppH9i5F7xzPwigiMj--5w";
         /*String access_token = null;
         try {
             JSONObject jsonData = weixinService.getAccessToken(code);
@@ -138,7 +138,7 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
                 throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("redis的报名信息activityId---为空"));
             }
             User userInfo=new User();
-            String nickName = "小雨";//userinfo_json.getString("nickname");
+            String nickName = "苹果呀";//userinfo_json.getString("nickname");
             String headimgurl = "http://thirdwx.qlogo.cn/mmopen/4eFHvhmOX6XuiaG6ib7wxkLa8AwMLFIbW9BSJ7EmwC3kRMUdgCrobdRUbhjMXbkY7aBc2CazjXFJiap5ianMH6yQnH2UQ4TfkXJw/132";//userinfo_json.getString("headimgurl");
             String sex ="2"; //userinfo_json.getString("sex");
             if (StringUtils.isBlank(sex)){