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

Helius

2020-07-06 2d789962b55bb692b328e6914ded9636f68c1baf

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