Merge remote-tracking branch 'origin/master'

无关风月

116 分钟以前 3548f8f669884e1caf9f037a726394464eb85d44

 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;