Merge branch 'master_activity' into base-modify

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

@@ -291,11 +291,11 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
     //获取用户信息
     public  ObjectRestResponse getUserInfo(Integer parentId,HttpServletRequest request){
         JSONObject obj =new JSONObject();
-        obj.put("parentId",0);
+        obj.put("pId",0);
         obj.put("name","");
         User user=userBiz.getSession(request);
         if (user!=null){
-            obj.put("parentId",user.getId());
+            obj.put("pId",user.getId());
             obj.put("name",user.getNickName());
         }
         if (parentId!=null&&parentId>0){
@@ -304,7 +304,7 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
                 obj.put("name",user.getNickName());
             }
         }
-        return  ObjectRestResponse.succ();
+        return  ObjectRestResponse.succ(obj);
     }
 
 }