Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

xiaoyong931011

2021-09-25 f6b8f3b4e6419e5675bf400e005b8ba115fb1dc1

 src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java

@@ -21,9 +21,9 @@

    private String updatedBy = "system";

    private Date createdTime;
    private Date createdTime = new Date();

    private Date updatedTime;
    private Date updatedTime = new Date();

    @TableId(value = "id",type = IdType.AUTO)
    private Long id;