Merge branch 'master' into whole_new

Helius

2020-09-13 099e6d54520dad06b887340ba02d532235360e5d

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