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

yujian

2020-03-25 010760fd974453a70948fef465284d8c817314f5

 fanli/src/main/java/com/yeshi/fanli/service/impl/common/JumpDetailV2ServiceImpl.java

@@ -70,7 +70,7 @@
      return jumpDetailV2;

   }



   @Cacheable(value = "configCache", key = "'getByTypeCache-'+#type+'-'+#platform+'-'+version")

   @Cacheable(value = "configCache", key = "'getByTypeCache-'+#type+'-'+#platform+'-'+#version")

   @Override

   public JumpDetailV2 getByTypeCache(String type, int platform, int version) {

      if (platform == 1) {