Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-03-05 4788c0abe7193191b3ca024b0f5f8fed196294bd

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

@@ -1,12 +1,16 @@
package com.ruoyi.common.core.domain;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;

/**
 * Entity基类
@@ -38,6 +42,43 @@
    /** 备注 */
    private String remark;

    @ApiModelProperty(value = "禁用备注")
    @TableField("disable_remark")
    private String disableRemark;

    @ApiModelProperty(value = "操作时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("operating_time")
    private LocalDateTime operatingTime;

    @ApiModelProperty(value = "操作人  登录名（登录账号）")
    @TableField("operating_person")
    private String operatingPerson;

    public String getDisableRemark() {
        return disableRemark;
    }

    public void setDisableRemark(String disableRemark) {
        this.disableRemark = disableRemark;
    }

    public LocalDateTime getOperatingTime() {
        return operatingTime;
    }

    public void setOperatingTime(LocalDateTime operatingTime) {
        this.operatingTime = operatingTime;
    }

    public String getOperatingPerson() {
        return operatingPerson;
    }

    public void setOperatingPerson(String operatingPerson) {
        this.operatingPerson = operatingPerson;
    }

    /** 请求参数 */
    @JsonInclude(JsonInclude.Include.NON_EMPTY)
    private Map<String, Object> params;