Merge branch 'master' of ssh://yujian@193.112.35.168:29418/fanli-server.git...

Administrator

2018-10-30 510ada3ccff31a61dd85c534f9d3a0abb7a36c20

 fanli/src/test/java/org/fanli/TaoKeTest.java

@@ -12,4 +12,14 @@
      TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 20, "", "A12CD85A-95B3-42B2-A042-5B42BF1A7094");

      System.out.println(result);

   }



   @Test

   public void test2() {

      System.out.println("测试合并");

   }



   @Test

   public void test3() {

      System.out.println("测试合并222");

   }

}