Merge branch 'master-2.0-pre-rename' into div

admin

2019-09-11 e6670f2a6513c0f1d6e4f2d867d1010970014849

 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);



   /**

    * 保存用户自定义