Merge remote-tracking branch 'origin/master'

yujian

2019-01-24 1b1f8fb628c08fc757139a34e2293db8d2529092

 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);
   
   /**
    * 后端列表查询