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

zainali5120

2020-10-25 bef3b23ca8918a355f6ff9751b46f4c35970f19e

 src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAccountMoneyChangeInfoVo.java

@@ -40,7 +40,7 @@
   private int status;

   

   @ApiModelProperty(value = "时间")

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

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

    private Date updateTime;



}