From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/domain/ZHonor.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZHonor.java b/zhang-content/src/main/java/com/ruoyi/domain/ZHonor.java
index d7db7f8..b6565b2 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZHonor.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZHonor.java
@@ -38,8 +38,8 @@
/**
* 绫诲埆,0锛氳瘉浠躲��1锛氳崳瑾夈��2锛氳祫璐�
*/
- @Excel(name = "绫诲埆(璇佷欢銆佽崳瑾夈�佽祫璐�)",readConverterExp = "0=璇佷欢,1=鑽ｈ獕,2=璧勮川")
- private Integer type;
+ @Excel(name = "绫诲埆")
+ private String type;
/**
* 鍚嶇О
--
Gitblit v1.9.1