From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/other/pojo/PdaVersion.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/other/pojo/PdaVersion.java b/src/main/java/com/ruoyi/other/pojo/PdaVersion.java
index d772071..8c0fc60 100644
--- a/src/main/java/com/ruoyi/other/pojo/PdaVersion.java
+++ b/src/main/java/com/ruoyi/other/pojo/PdaVersion.java
@@ -2,59 +2,53 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.sales.pojo.CommonFile;
-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;
import java.io.Serializable;
import java.time.LocalDateTime;
-import java.util.List;
@Data
@TableName("pda_version")
-@ApiModel(value = "PdaVersion", description = "PDA鐗堟湰淇℃伅琛�")
+@Schema(name = "PdaVersion", description = "PDA鐗堟湰淇℃伅琛�")
public class PdaVersion implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍚嶇О")
+ @Schema(description = "鍚嶇О")
private String name;
- @ApiModelProperty("鐗堟湰鍙�")
+ @Schema(description = "鐗堟湰鍙�")
private String version;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@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", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @TableField(exist = false)
- private List<CommonFile> commonFileList;
-
@TableField(fill = FieldFill.INSERT)
private Long deptId;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3