Merge branch 'dev1'

Administrator

2018-11-30 d66e9c7c859f255b0e81e01a57707c5b9a34d7ff

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