Merge remote-tracking branch 'origin/master'

admin

2018-12-05 21f49216736c547d99ec1dd46a24c6f43f852fc5

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java

@@ -63,6 +63,16 @@
         recommendActivity.setInviteInfo(info);

      }



      if (recommendActivity !=null) {

         ActivityUser activityUser = recommendActivity.getActivityUser();

         if (activityUser != null) {

            ActivityUser resultUser = activityService.selectActivityUserByPrimaryKey(activityUser.getId());

            if (resultUser != null) {

               recommendActivity.setActivityUser(resultUser);

            }

         }

      }

		
      if (StringUtil.isNullOrEmpty(callback)) {

         out.print(JsonUtil.loadTrueResult(recommendActivity));

      } else {