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

admin

2020-03-03 24df43fb3f2e136d3d768abf89f098c290c2bab8

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java

@@ -239,7 +239,7 @@
         // 2.0.7返回发圈+活动+学院+素材
         list.add(map.get(TYPE_FAQUAN));
         list.add(map.get(TYPE_HUODONG));
         // list.add(map.get(TYPE_XUEYUAN));
//         list.add(map.get(TYPE_XUEYUAN));
         list.add(map.get(TYPE_SUCAI));

      } else if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
@@ -675,6 +675,7 @@
         data.put("list", gson.toJson(list));
         out.print(JsonUtil.loadTrueResult(data));
      } catch (Exception e) {
         e.printStackTrace();
         out.print(JsonUtil.loadFalseResult(1, "查询信息失败"));
         LogHelper.errorDetailInfo(e);
      }