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

xiaoyong931011

2021-06-28 0741dc7f25811ea2acb4127fc43d1dc9a802221c

 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;