From 835ac4c14a2ae8d17578e2b7bbbaa54d5a12f40a Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 15 一月 2024 17:01:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java
index 9e38e29..c99a127 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java
@@ -9,9 +9,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.*;
@@ -32,7 +30,7 @@
@AllArgsConstructor
@Schema(name = "鍐滄埛瀹炰綋")
public class SeClient implements BaseEntity {
- public static final long serialVersionUID = 202311141539001L;
+ public static final long serialVersionUID = 202401151518003L;
/**
* 涓婚敭
@@ -91,6 +89,13 @@
private String name;
/**
+ * 铏氭嫙鍗″彿;10浣嶏紝浠�1000000000寮�濮�
+ */
+ @Schema(description = "铏氭嫙鍗″彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "铏氭嫙鍗″彿涓嶈兘涓虹┖")
+ private Long virtualid;
+
+ /**
* 鍐滄埛缂栧彿;6浣嶅尯鍒� + 4涓洪『搴忓彿
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@@ -136,6 +141,12 @@
private Double area;
/**
+ * 鐢ㄦ按绫诲瀷ID
+ */
+ @Schema(description = "鐢ㄦ按绫诲瀷ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Long typeid;
+
+ /**
* 琛楅亾鍙婇棬鐗屽彿
*/
@Schema(description = "琛楅亾+闂ㄧ墝鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -150,10 +161,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鎿嶄綔浜虹紪鍙蜂笉鑳戒负绌�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鎿嶄綔浜篒D涓嶈兘涓虹┖")
private Long operator;
/**
@@ -168,12 +179,14 @@
@Schema(description = "鏄惁绂佺敤", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Max(message = "鏄惁绂佺敤鍙兘0鎴�1", value = 1)
@Min(message = "鏄惁绂佺敤鍙兘0鎴�1",value = 0)
+ @TableField(updateStrategy = FieldStrategy.NEVER)
private Byte disabled;
/**
* 閫昏緫鍒犻櫎鏍囪瘑;0-鏈垹闄わ紝1-鍒犻櫎
*/
@Schema(description = "鍒犻櫎鏍囪瘑锛宖orm琛ㄥ崟涓笉瀛樺湪锛屽彧鍦ㄦ煡璇㈡樉绀轰腑鏈夋晥", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @TableField(updateStrategy = FieldStrategy.NEVER)
private Byte deleted;
}
\ No newline at end of file
--
Gitblit v1.8.0