Merge branch 'mater-1.6.0' into div

admin

2019-08-22 a9b7fab63c4345a6b183bffdab1bb0884f4202b5

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/common/JumpDetailV2Mapper.java

@@ -61,7 +61,7 @@
    * @param version
    * @return
    */
   JumpDetailV2 selectAndroidByTypeAndVersion(String type, int version);
   JumpDetailV2 selectAndroidByTypeAndVersion(@Param("type")String type, @Param("version")int version);
   
   /**
    * 根据IOS版本获取最近的跳转值
@@ -69,6 +69,6 @@
    * @param version
    * @return
    */
   JumpDetailV2 selectIOSByTypeAndVersion(String type, int version);
   JumpDetailV2 selectIOSByTypeAndVersion(@Param("type")String type, @Param("version")int version);

}