Merge remote-tracking branch 'origin/master'

Administrator

2018-11-16 31ff429482f7c69eff8ef4d3a46387a2d9bcfdb0

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/HomeNavbarMapper.java

@@ -40,7 +40,7 @@
    * @param order 排序值
    * @return
    */
   List<HomeNavbar> getChangeOrder(@Param("id") Long id, @Param("type") Integer type, @Param("order") Integer order);
   List<HomeNavbar> getChangeOrder(@Param("type") Integer type, @Param("order") Integer order);
   
   /**
    * 后端列表查询