From 9562ac3fe06ba6b2d9cf3357382c25e364c88906 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 21 八月 2024 11:41:56 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 bf1a7fd..9b2ce60 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
@@ -21,7 +21,7 @@
*/
@Data
@ApiModel
-@TableName("")
+@TableName("sys_oper_log")
public class SysOperLog extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -51,6 +51,7 @@
/**
* 业务类型数组
*/
+ @TableField(exist = false)
private Integer[] businessTypes;
/**
@@ -81,7 +82,7 @@
*/
@Excel(name = "操作人员")
@ApiModelProperty("操作人员")
- @TableField("operator_type")
+ @TableField("oper_name")
private String operName;
/**
@@ -89,6 +90,7 @@
*/
@Excel(name = "部门名称")
@ApiModelProperty("部门名称")
+ @TableField("dept_name")
private String deptName;
/**
@@ -96,6 +98,7 @@
*/
@Excel(name = "请求地址")
@ApiModelProperty("请求地址")
+ @TableField("oper_url")
private String operUrl;
/**
@@ -103,6 +106,7 @@
*/
@Excel(name = "操作地址")
@ApiModelProperty("操作地址")
+ @TableField("oper_ip")
private String operIp;
/**
@@ -110,6 +114,7 @@
*/
@Excel(name = "请求参数")
@ApiModelProperty("请求参数")
+ @TableField("oper_param")
private String operParam;
/**
@@ -117,6 +122,7 @@
*/
@Excel(name = "返回参数")
@ApiModelProperty("返回参数")
+ @TableField("json_result")
private String jsonResult;
/**
@@ -131,6 +137,7 @@
*/
@Excel(name = "错误消息")
@ApiModelProperty("错误消息")
+ @TableField("error_msg")
private String errorMsg;
/**
@@ -139,6 +146,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("操作时间")
+ @TableField("oper_time")
private Date operTime;
/**
@@ -146,6 +154,7 @@
*/
@Excel(name = "消耗时间", suffix = "毫秒")
@ApiModelProperty("消耗时间")
+ @TableField("cost_time")
private Long costTime;
public Long getOperId() {
--
Gitblit v1.7.1