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/TDept.java | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java
new file mode 100644
index 0000000..93144fe
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java
@@ -0,0 +1,71 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * <p>
+ * 部门管理
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_dept")
+@ApiModel(value="TDept对象", description="部门管理")
+public class TDept extends BaseModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+
+ @NotBlank(message = "部门ID不能为空")
+ @Length(max = 10, message = "部门ID不能超过10个字符")
+ @ApiModelProperty(value = "部门id")
+ @TableField("dept_id")
+ private String deptId;
+
+ @NotBlank(message = "部门名称不能为空")
+ @ApiModelProperty(value = "部门名称")
+ @TableField("dept_name")
+ private String deptName;
+
+ @ApiModelProperty(value = "部门状态 1=启用 0=禁用")
+ @TableField("status")
+ private Integer status;
+
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
+ private String remark;
+
+ @ApiModelProperty(value = "禁用备注")
+ @TableField("disable_remark")
+ private String disableRemark;
+
+ @ApiModelProperty(value = "操作时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("operating_time")
+ private LocalDateTime operatingTime;
+
+ @ApiModelProperty(value = "操作人 登录名（登录账号）")
+ @TableField("operating_person")
+ private String operatingPerson;
+
+}
--
Gitblit v1.7.1