From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/SearchHistory.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/SearchHistory.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/SearchHistory.java
index a83d551..c7a4308 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/SearchHistory.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/SearchHistory.java
@@ -59,8 +59,8 @@
     @ExcelColumn(name="鎼滅储璇�")
     private String content;
 
-    @ApiModelProperty(value = "绫诲瀷 0鍙戠幇 1鐧剧 2闂ㄥ簵", example = "1")
-    @ExcelColumn(name="绫诲瀷 0鍙戠幇 1鐧剧 2闂ㄥ簵")
+    @ApiModelProperty(value = "绫诲瀷 0鍟嗗搧", example = "1")
+    @ExcelColumn(name="绫诲瀷 0鍟嗗搧")
     private Integer type;
 
 }

--
Gitblit v1.9.3