From 10de85f85ad0874b2d93c851bb4d3eacab24a183 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 21 八月 2024 14:45:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
index 1e04af6..bf1a7fd 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
@@ -2,16 +2,26 @@
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 操作日志记录表 oper_log
  *
  * @author ruoyi
  */
+@Data
+@ApiModel
+@TableName("")
 public class SysOperLog extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 	
@@ -19,18 +29,23 @@
 	 * 日志主键
 	 */
 	@Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
+	@ApiModelProperty("数据id")
+	@TableId(value = "oper_id", type = IdType.AUTO)
 	private Long operId;
 	
 	/**
 	 * 操作模块
 	 */
 	@Excel(name = "操作模块")
+	@ApiModelProperty("操作模块")
 	private String title;
 	
 	/**
 	 * 业务类型(0其它 1新增 2修改 3删除)
 	 */
 	@Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
+	@ApiModelProperty("0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
+	@TableField("business_type")
 	private Integer businessType;
 	
 	/**
@@ -42,66 +57,80 @@
 	 * 请求方法
 	 */
 	@Excel(name = "请求方法")
+	@ApiModelProperty("请求方法")
 	private String method;
 	
 	/**
 	 * 请求方式
 	 */
 	@Excel(name = "请求方式")
+	@ApiModelProperty("请求方式")
+	@TableField("request_method")
 	private String requestMethod;
 	
 	/**
 	 * 操作类别(0其它 1后台用户 2手机端用户)
 	 */
 	@Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
+	@ApiModelProperty("0=其它,1=后台用户,2=手机端用户")
+	@TableField("operator_type")
 	private Integer operatorType;
 	
 	/**
 	 * 操作人员
 	 */
 	@Excel(name = "操作人员")
+	@ApiModelProperty("操作人员")
+	@TableField("operator_type")
 	private String operName;
 	
 	/**
 	 * 部门名称
 	 */
 	@Excel(name = "部门名称")
+	@ApiModelProperty("部门名称")
 	private String deptName;
 	
 	/**
 	 * 请求url
 	 */
 	@Excel(name = "请求地址")
+	@ApiModelProperty("请求地址")
 	private String operUrl;
 	
 	/**
 	 * 操作地址
 	 */
 	@Excel(name = "操作地址")
+	@ApiModelProperty("操作地址")
 	private String operIp;
 	
 	/**
 	 * 请求参数
 	 */
 	@Excel(name = "请求参数")
+	@ApiModelProperty("请求参数")
 	private String operParam;
 	
 	/**
 	 * 返回参数
 	 */
 	@Excel(name = "返回参数")
+	@ApiModelProperty("返回参数")
 	private String jsonResult;
 	
 	/**
 	 * 操作状态(0正常 1异常)
 	 */
 	@Excel(name = "状态", readConverterExp = "0=正常,1=异常")
+	@ApiModelProperty("0=正常,1=异常")
 	private Integer status;
 	
 	/**
 	 * 错误消息
 	 */
 	@Excel(name = "错误消息")
+	@ApiModelProperty("错误消息")
 	private String errorMsg;
 	
 	/**
@@ -109,12 +138,14 @@
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty("操作时间")
 	private Date operTime;
 	
 	/**
 	 * 消耗时间
 	 */
 	@Excel(name = "消耗时间", suffix = "毫秒")
+	@ApiModelProperty("消耗时间")
 	private Long costTime;
 	
 	public Long getOperId() {

--
Gitblit v1.7.1