From d1b9a449556b86fb23ae65022d2f5d806fdd2e73 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 29 九月 2025 17:10:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java | 35 ++++++-----------------------------
1 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java
index dccbf36..76eecee 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java
@@ -1,16 +1,14 @@
package com.ruoyi.system.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
/**
* <p>
@@ -24,11 +22,11 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user")
@ApiModel(value="TAppUser对象", description="人员管理")
-public class TAppUser implements Serializable {
+public class TAppUser extends BaseModel {
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "姓名")
@@ -67,29 +65,8 @@
@TableField("other_count")
private Integer otherCount;
- @ApiModelProperty(value = "创建时间")
- @TableField("create_time")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "修改时间")
- @TableField("update_time")
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "创建人")
- @TableField("create_by")
- private String createBy;
-
- @ApiModelProperty(value = "修改人")
- @TableField("update_by")
- private String updateBy;
-
- @ApiModelProperty(value = "是否删除 0=否 1=是")
- @TableField("disabled")
- @TableLogic
- private Integer disabled;
-
-
- @ApiModelProperty(value = "状态 0待审核 1通过 2拒绝")
+ @ApiModelProperty(value = "审核状态 0=待审核 1=通过 2=拒绝")
+ @TableField("state")
private Integer state;
@ApiModelProperty(value = "职业技能")
--
Gitblit v1.7.1