Merge remote-tracking branch 'origin/master'

无关风月

昨天 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java

@@ -88,13 +88,7 @@
        this.disabled = disabled;
    }

    public LocalDateTime getCreateTime() {
        return createTime;
    }

    public void setCreateTime(LocalDateTime createTime) {
        this.createTime = createTime;
    }

    public LocalDateTime getUpdateTime() {
        return updateTime;