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/sales/pojo/SalespersonManagement.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java b/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java
index a0a6636..f826397 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,7 +18,7 @@
*/
@TableName(value = "salesperson_management")
@Data
-@ApiModel
+@Schema
public class SalespersonManagement {
private static final long serialVersionUID = 1L;
@@ -29,51 +28,54 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "濮撳悕")
+ @Schema(description = "濮撳悕")
private String name;
- @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ @Schema(description = "鑱旂郴鐢佃瘽")
private String phone;
- @ApiModelProperty(value = "閭")
+ @Schema(description = "閭")
private String email;
- @ApiModelProperty(value = "閮ㄩ棬")
+ @Schema(description = "閮ㄩ棬")
private String department;
- @ApiModelProperty(value = "鑱屼綅")
+ @Schema(description = "鑱屼綅")
private String position;
- @ApiModelProperty(value = "鍏ヨ亴鏃ユ湡")
+ @Schema(description = "鍏ヨ亴鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date hireDate;
- @ApiModelProperty(value = "鏉冮檺")
+ @Schema(description = "鏉冮檺")
private String permissions;
- @ApiModelProperty(value = "鏉冮檺List")
+ @Schema(description = "鏉冮檺List")
@TableField(exist = false)
private List<String> permissionsList;
- @ApiModelProperty(value = "鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3