Merge branch 'master_activity' into base-modify

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

@@ -158,17 +158,17 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
                         log.info("-----userBmByKey---key已存在去报名/签到----报名/签到成功");
                         if (activityBm.getBmStatus()==1){
                             jsonObject.put("isbm",1);
-                            jsonObject.put("bm_status",1);
+                            jsonObject.put("bmStatus",1);
                         }else if (activityBm.getQdStatus()==1){
                             jsonObject.put("isqd",1);
-                            jsonObject.put("qd_status",1);
+                            jsonObject.put("qdStatus",1);
                         }
                     }else {
                         log.info("-----userBmByKey---key已存在去报名/签到----报名/签到失败");
                         if (activityBm.getBmStatus()==1){
-                            jsonObject.put("bm_status",2);
+                            jsonObject.put("bmStatus",2);
                         }else if (activityBm.getQdStatus()==1){
-                            jsonObject.put("qd_status",2);
+                            jsonObject.put("qdStatus",2);
                         }
                     }
                     summbitRedisTemplate.delete(key);