Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-29 ac208d6f60284be820fe82dfdf44142f02d9e3ef

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java

@@ -155,7 +155,6 @@
      JSONObject data = new JSONObject();

      data.put("count", count);

      data.put("list", JsonUtil.getApiCommonGson().toJson(list));



      out.print(JsonUtil.loadTrueResult(data));

   }