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

admin

2019-07-31 5046ecde3cd849511a337e25e13af7df7f1894bc

 fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java

@@ -123,6 +123,11 @@
      }

      

      try {   

         Integer useType = hotSearch.getUseType();

         if (useType == null) {

            hotSearch.setUseType(Constant.SOURCE_TYPE_TAOBAO);

         }

			
         hotSearch.setId(null);

         hotSearchService.addHotSearch(hotSearch);

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("添加成功"));