Merge branch 'master' into whole

Helius

2020-09-11 3bc7c53fe0ecd6fa51c9d90c972987af40687ffe

 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;
}