Merge branch 'master' into whole_new

Helius

2020-09-13 099e6d54520dad06b887340ba02d532235360e5d

 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;