From cf347859a3a023f48bdb82e7702c0df8858759db Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期四, 10 八月 2023 13:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
index cf2e20c..c568112 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
@@ -1,9 +1,7 @@
package com.yuanchu.limslaboratory.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
@@ -39,6 +37,7 @@
@ApiModelProperty(value = "0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺")
private Integer power;
+ @TableLogic(value = "1", delval = "0")
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0")
private Integer state;
@@ -50,6 +49,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
private Date updateTime;
+ @Version
@ApiModelProperty(value = "涔愯閿�")
private Integer version;
--
Gitblit v1.9.3