Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-03-30 25c3d8e604e2ca24da6aeb2c018acafca9b11c38

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