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

admin

2020-03-14 55b3bd7821f14db9e9441d8b34fb9bdc1a9e4df7

 fanli/src/main/java/com/yeshi/fanli/util/factory/JumpDetailParamsFactory.java

@@ -70,9 +70,11 @@
    * @param auctionId

    * @return

    */

   public static String createGoodsParams(Long auctionId) {

   public static String createGoodsParams(Long auctionId, Integer goodsType) {

      JSONObject data = new JSONObject();

      data.put("id", auctionId);

      if (goodsType != null)

         data.put("goodsType", goodsType);

      return data.toString();

   }