Merge remote-tracking branch 'origin/div' into div

admin

2020-06-16 2886d5a6eee762ad7b776e930fc49b01fb64dd5e

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



   /**

    * 保存用户自定义