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

admin

2020-07-01 65844c288f03ddd14892b5aea5e9ef862f3afb01

 fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java

@@ -700,7 +700,7 @@
    * @throws

    */

   public static String convertLink(Long auctionId, String pid) {

      TaoKeAppInfo app = APP_KEYS[1];

      TaoKeAppInfo app = APP_KEYS[0];

      Map<String, String> params = new TreeMap<>();

      params.put("version", "v1.1.1");

      params.put("goodsId", auctionId + "");