From 9b138d5216ad21a69d0dfde310ccc81e53fb627e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 09 四月 2024 15:38:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/DuLog.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java b/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
index 9069da9..113d2fb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
@@ -64,8 +64,8 @@
@ExcelColumn(name="绠�浠�")
private String content;
- @ApiModelProperty(value = "绫诲瀷 0鎻愪氦鐢宠 1瀹℃壒鍗曚綅閫氳繃 2瀹℃壒鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃壒宸ョ閫氳繃 6瀹℃壒宸ョ涓嶉�氳繃", example = "1")
- @ExcelColumn(name="绫诲瀷 0鎻愪氦鐢宠 1瀹℃壒鍗曚綅閫氳繃 2瀹℃壒鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃壒宸ョ閫氳繃 6瀹℃壒宸ョ涓嶉�氳繃")
+ @ApiModelProperty(value = "绫诲瀷 0鎻愪氦鐢宠 1瀹℃牳鍗曚綅閫氳繃 2瀹℃牳鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃牳宸ョ閫氳繃 6瀹℃牳宸ョ涓嶉�氳繃", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鎻愪氦鐢宠 1瀹℃牳鍗曚綅閫氳繃 2瀹℃牳鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃牳宸ョ閫氳繃 6瀹℃牳宸ョ涓嶉�氳繃")
private Integer objType;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
--
Gitblit v1.9.3