From 5b73f899c41957496ee0e4257a8e8bd38fc51d37 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 九月 2026 14:50:10 +0800
Subject: [PATCH] 天津-智科电子 1.协同办公-协同审批:待审批节点,第三人账号不可进行修改 2.营销管理-销售台账:勾选单个导出会出现整个导出的情况,但只能显示父项、不能显示子项 3.营销管理-销售台账:点击下拉没有价格,点击详情有价格
---
src/main/java/com/ruoyi/staff/pojo/PersonalShift.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java b/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java
index b47d63d..67bcf7d 100644
--- a/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java
+++ b/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java
@@ -9,8 +9,7 @@
import java.time.LocalDateTime;
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.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -26,7 +25,7 @@
@Getter
@Setter
@TableName("personal_shift")
-@ApiModel(value = "PersonalShift瀵硅薄", description = "")
+@Schema(name = "PersonalShift瀵硅薄", description = "")
public class PersonalShift implements Serializable {
private static final long serialVersionUID = 1L;
@@ -34,29 +33,29 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鐝(鎵撳崱瑙勫垯id)")
+ @Schema(description = "鐝(鎵撳崱瑙勫垯id)")
private Integer personalAttendanceLocationConfigId;
- @ApiModelProperty("鍛樺伐鍦ㄨ亴id")
+ @Schema(description = "鍛樺伐鍦ㄨ亴id")
private Long staffOnJobId;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("鎺掔彮鏃ユ湡")
+ @Schema(description = "鎺掔彮鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime workTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
--
Gitblit v1.9.3