Merge remote-tracking branch 'origin/master'

Administrator

2018-11-09 603203f018fa5d105070574bd3383c8fe4d72bb0

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

@@ -25,5 +25,10 @@
    */
   List<JumpDetailV2> listByType(String type);
   
   /**
    * 所有方式
    * @return
    */
    List<JumpDetailV2> listJump();
   
}