Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-03-26 4bfb58a3ee4a2c8be9588298c038efda3f5fe85e

 src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java

@@ -37,7 +37,7 @@
   @ApiModelProperty(value = "剩余时间")

    private Long timeLeft;

   @ApiModelProperty(value = "下单时间")

   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

   @JsonFormat(pattern = "MM-dd HH:mm:ss", timezone = "GMT+8")

    private Date createTime;

   @ApiModelProperty(value = "平台收款方式")

   private List<PlatformPaymentMethodEntity> platforPaymentMethodList;