Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-28 565c0a03a299de5a619f4d5b5fe593e46dbf35dd

 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarUserService.java

@@ -12,7 +12,7 @@
    * 查询导航栏

    * @return

    */

   public List<HomeNavbar> listEffectiveNavbar(Long uid, String device);

   public List<HomeNavbar> listEffectiveNavbar(Long uid, String device, Integer sex);



   /**

    * 保存用户自定义