Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

xiaoyong931011

2020-05-31 8fd540a4a03dd32cb66bf1e0fc5fac3e0b214515

 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;