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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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) {