Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-07-22 f4ef9fccb3347fd364ca59575bf62fe5e4362f59

 gc-core/src/main/java/com/xzx/gc/common/entity/BaseEntity.java

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

    private String delFlag;
    private short delFlag;

    private Integer revision;