From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultAreaDic.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 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
new file mode 100644
index 0000000..74bcb88
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultAreaDic.java
@@ -0,0 +1,46 @@
+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;
+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>
+ * 故障区域
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_fault_area_dic")
+@ApiModel(value="TFaultAreaDic对象", description="故障区域")
+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