From d47f6d80fcd0ccb279a27fd80c3bd45775fc2eed Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期五, 07 二月 2025 11:19:49 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into xizang-changyun

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

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultAreaDic.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultAreaDic.java
index f122268..74bcb88 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultAreaDic.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultAreaDic.java
@@ -5,10 +5,15 @@
 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;
 import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * <p>
@@ -22,16 +27,20 @@
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_fault_area_dic")
 @ApiModel(value="TFaultAreaDic对象", description="故障区域")
-public class TFaultAreaDic implements Serializable {
+public class TFaultAreaDic extends BaseModel {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
+    @NotBlank(message = "故障区域名称不能为空")
     @ApiModelProperty(value = "故障区域名称")
     @TableField("fault_area_name")
     private String faultAreaName;
 
-
+    @NotNull(message = "权重不能为空")
+    @ApiModelProperty(value = "权重")
+    @TableField("sort_by")
+    private Integer sortBy;
 }

--
Gitblit v1.7.1