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

admin

2020-02-12 df7554c138d0366514968eba9a32670876510df7

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

@@ -160,7 +160,7 @@


      // 2.0.6版本增加 学院栏目

      if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {

         list.add(menu6);

         //list.add(menu6);

      }

      list.add(menu4);