From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
index a94a473..3248894 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.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;
@@ -41,12 +39,6 @@
@ApiModelProperty(value = "浼佷笟绠�绉�")
private String byname;
- @ApiModelProperty(value = "鑱旂郴浜鸿处鍙�")
- private String linkAccount;
-
- @ApiModelProperty(value = "鑱旂郴浜哄瘑鐮�")
- private String linkPassword;
-
@ApiModelProperty(value = "鑱旂郴浜哄悕瀛�")
private String linkName;
@@ -61,6 +53,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
private Date updateTime;
+ @Version
@ApiModelProperty(value = "閿�")
private Integer version;
--
Gitblit v1.9.3