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

admin

2020-06-22 07a64ebd6da54fb9481d9bf7e7afce62dce1ff21

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

@@ -111,6 +111,7 @@
         root.put("count", 1000);

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

      } catch (Exception e) {

         e.printStackTrace();

         out.print(JsonUtil.loadFalseResult("获取出错"));

      }

   }