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

yujian

2019-07-22 004fdfb7f9c02e69b1a5dd4add1461bd4ce83855

 fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java

@@ -239,9 +239,6 @@
      if (filter.getIsPG() != null)

         json.put("isPG", filter.getIsPG());



      if (filter.getIsCoupon() != null)

         json.put("isCoupon", filter.getIsCoupon());



      if (filter.getPingouPriceStart() != null)

         json.put("pingouPriceStart", filter.getPingouPriceStart());



@@ -256,6 +253,10 @@


      if (filter.getShopId() != null)

         json.put("shopId", filter.getShopId());

		
      if (filter.getOwner() != null)

         json.put("owner", filter.getOwner());

		
      System.out.println(json.toString());

      

      JSONObject jsonDTO = new JSONObject();