From a77decc3df26449414639082293e2ee6722e643c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 15:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java
index 967769e..ae11cff 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java
@@ -1,7 +1,7 @@
package com.ruoyi.collaborativeApproval.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -15,13 +15,13 @@
// /**
// * 鐢ㄦ埛ID锛堟墍灞炶�咃級
// */
-// @ApiModelProperty("鐢ㄦ埛ID锛堟墍灞炶�咃級")
+// @Schema(description = "鐢ㄦ埛ID锛堟墍灞炶�咃級")
// private Integer userId;
/**
* 鍛樺伐ID
*/
- @ApiModelProperty("鍛樺伐ID")
+ @Schema(description = "鍛樺伐ID")
private Integer contactId;
/**
* 鍒涘缓鑰�
@@ -40,4 +40,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3