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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

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

    * @return

    */

   public static String createGoodsParams(ClientTBPid clientTBPid, 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();

   }