Merge branch 'master' into follow

Helius

2020-08-11 f91a65805c27c2bb01eb94f1ec9c2afa07a44020

 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;