Merge branch 'master_activity' into dev

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

@@ -100,15 +100,9 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         try {
             activity.setCrtTime(System.currentTimeMillis());
             activity.setIsDel(0);
-            if (activity.getIsOpenBm() == null) {
-                activity.setIsOpenBm(0);
-            }
             if (activity.getIsPublish() == null) {
                 activity.setIsPublish(0);
             }
-            if (activity.getIsShow() == null) {
-                activity.setIsShow(0);
-            }
             mapper.insertSelective(activity);
             return true;
         } catch (Exception e) {

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 = "oXDd91MppH9i5F7xzPwigiMj--5w";
+        String openid = "oXDd91N8Rwijd3gscAND9TO77a2I";
         /*String access_token = null;
         try {
             JSONObject jsonData = weixinService.getAccessToken(code);