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

yujian

2019-06-24 cb6f69f1207ab6cc9c6006515cb831833cfe0d36

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HomeNavbarController.java

@@ -33,7 +33,7 @@
    */

   @RequestMapping(value = "gethomenavbar", method = RequestMethod.POST)

   public void gethomenavbar(AcceptData acceptData, PrintWriter out) {

      List<HomeNavbar> listNavbar = homeNavbarService.listQueryEffectiveNavbar();

      List<HomeNavbar> listNavbar = homeNavbarService.listQueryDefaultNavbar(0);

      if (listNavbar == null) {

         listNavbar = new ArrayList<HomeNavbar>();

      }