Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-11-15 47b56397ce10d4927ccc303539c103cf5d5dbe30

 src/main/java/com/xcong/excoin/common/system/base/BaseEntity.java

@@ -28,4 +28,6 @@

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

    private Integer version;
}