From ad870776cab91441b0160dd8ec7b3bec6b256603 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 四月 2025 11:29:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java b/server/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java
index bf77f5d..2213746 100644
--- a/server/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java
+++ b/server/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java
@@ -1,6 +1,5 @@
package com.doumee.dao.system.model;
-import com.doumee.core.annotation.excel.ExcelExportColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -27,11 +26,9 @@
private Integer userId;
@ApiModelProperty(value = "鍥哄寲鐢ㄦ埛鍚�")
- @ExcelExportColumn(name="鎿嶄綔浜虹敤鎴峰悕")
private String username;
@ApiModelProperty(value = "鍥哄寲鐢ㄦ埛濮撳悕")
- @ExcelExportColumn(name="鎿嶄綔浜哄鍚�")
private String userRealname;
@ApiModelProperty(value = "鍥哄寲鐢ㄦ埛瑙掕壊")
@@ -41,75 +38,57 @@
private String userPermissions;
@ApiModelProperty(value = "鎿嶄綔妯″潡")
- @ExcelExportColumn(name="鎿嶄綔妯″潡")
private String operaModule;
@ApiModelProperty(value = "鎿嶄綔绫诲瀷")
- @ExcelExportColumn(name="鎿嶄綔绫诲瀷")
private String operaType;
@ApiModelProperty(value = "鎿嶄綔澶囨敞")
- @ExcelExportColumn(name="澶囨敞", width = 5)
private String operaRemark;
@ApiModelProperty(value = "鎿嶄綔寮�濮嬫椂闂�")
- @ExcelExportColumn(name="鎿嶄綔寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 10)
private Date operaTime;
@ApiModelProperty(value = "鑰楁椂", example = "1")
- @ExcelExportColumn(name="鑰楁椂锛坢s锛�")
private Integer operaSpendTime;
@ApiModelProperty(value = "璇锋眰鏂瑰紡")
- @ExcelExportColumn(name="璇锋眰鏂瑰紡")
private String requestMethod;
@ApiModelProperty(value = "璇锋眰鍦板潃")
- @ExcelExportColumn(name="璇锋眰鍦板潃", width = 14)
private String requestUri;
@ApiModelProperty(value = "璇锋眰鍙傛暟")
- @ExcelExportColumn(name="璇锋眰鍙傛暟", width = 16)
private String requestParams;
@ApiModelProperty(value = "璇锋眰缁撴灉")
- @ExcelExportColumn(name="璇锋眰缁撴灉", width = 10)
private String requestResult;
@ApiModelProperty(value = "鐘舵�侊紙0鎿嶄綔澶辫触锛�1鎿嶄綔鎴愬姛锛�-1鏈緱鍒板鐞嗭級", example = "1")
- @ExcelExportColumn(name="鐘舵��", valueMapping = "0=鎿嶄綔澶辫触;1=鎿嶄綔鎴愬姛;-1=鏈鐞�", width = 4)
private Integer status;
@ApiModelProperty(value = "寮傚父绛夌骇")
- @ExcelExportColumn(name="寮傚父绛夌骇", valueMapping = "0=浣�;5=涓�;10=楂�")
private Integer exceptionLevel;
@ApiModelProperty(value = "寮傚父淇℃伅")
- @ExcelExportColumn(name="寮傚父淇℃伅", width = 16)
private String exceptionStack;
@ApiModelProperty(value = "IP")
- @ExcelExportColumn(name="IP", width = 8)
private String ip;
@ApiModelProperty(value = "鏈嶅姟鍣↖P")
- @ExcelExportColumn(name="鏈嶅姟鍣↖P", width = 8)
private String serverIp;
@ApiModelProperty(value = "鎺ュ彛鐗堟湰")
- @ExcelExportColumn(name="鎺ュ彛鐗堟湰")
private String systemVersion;
@ApiModelProperty(value = "鎿嶄綔骞冲彴")
- @ExcelExportColumn(name="鎿嶄綔骞冲彴")
private String platform;
@ApiModelProperty(value = "瀹㈡埛绔俊鎭�")
- @ExcelExportColumn(name="瀹㈡埛绔俊鎭�", width = 10)
private String clientInfo;
@ApiModelProperty(value = "绯荤粺淇℃伅")
- @ExcelExportColumn(name="绯荤粺淇℃伅")
private String osInfo;
}
--
Gitblit v1.9.3