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

admin

2019-07-23 dc675e0c19849b1d1a77c64f0b5c6a25eb91ace2

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

   }