From c885f99c9ff1445f6975d16faf4a23006cd5763b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 二月 2025 14:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultDescribeDic.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultDescribeDic.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultDescribeDic.java
index 7811826..7a15f58 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultDescribeDic.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultDescribeDic.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,7 +16,7 @@
* </p>
*
* @author xiaochen
- * @since 2025-01-17
+ * @since 2025-01-20
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -25,15 +26,15 @@
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "故障区域id")
- @TableField("faultId")
+ @TableField("fault_id")
private String faultId;
@ApiModelProperty(value = "故障描述")
- @TableField("describeName")
+ @TableField("describe_name")
private String describeName;
--
Gitblit v1.7.1