From ebf94cb3ed4f487ca1fcd7069db0ca141553a4db Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 20 六月 2025 17:52:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TProblemEscalation.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TProblemEscalation.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TProblemEscalation.java
index 9144f40..fd31d1e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TProblemEscalation.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TProblemEscalation.java
@@ -36,7 +36,7 @@
 
     @ApiModelProperty(value = "问题类型id")
     @TableField("escalation_type")
-    private Integer escalationType;
+    private String escalationType;
 
     @ApiModelProperty(value = "上报内容")
     @TableField("escalation_content")

--
Gitblit v1.7.1