Merge remote-tracking branch 'origin/master'

admin

2019-05-15 3be3f6e670d2e11d7ced76b8202f0ef30b56870f

 fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java

@@ -85,26 +85,6 @@
      }

   }



   /**

    * 添加足迹

    * 
    * @param acceptData

    * @param out

    */

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

   public void addHistory(AcceptData acceptData, Long sid, Long uid, PrintWriter out) {

      try {

         if (sid == null || sid == 0) {

            out.print(JsonUtil.loadFalseResult("店铺id为空"));

            return;

         }

			
         out.print(JsonUtil.loadTrueResult("记录成功"));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("记录失败"));

         e.printStackTrace();

      }

   }





   /**