From c3ac3682cac1d5dc3f2310418502c1c96ffe5a7e Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 07 二月 2025 11:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultDescribeDic.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 7a15f58..7a87cdb 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
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_fault_describe_dic")
@ApiModel(value="TFaultDescribeDic对象", description="故障描述")
-public class TFaultDescribeDic implements Serializable {
+public class TFaultDescribeDic extends BaseModel {
private static final long serialVersionUID = 1L;
@@ -37,5 +39,8 @@
@TableField("describe_name")
private String describeName;
+ @ApiModelProperty(value = "权重")
+ @TableField("sort_by")
+ private Integer sortBy;
}
--
Gitblit v1.7.1