From c247f5bf64c98595cc7e4efc9e1ae7ff1df79c11 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:05:32 +0800
Subject: [PATCH] refactor(swagger): 迁移Swagger注解到OpenAPI 3.0
---
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
index c2004c3..a89317b 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -6,11 +6,15 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -23,7 +27,7 @@
@Getter
@Setter
@TableName("purchase_return_orders")
-@ApiModel(value = "PurchaseReturnOrders瀵硅薄", description = "閲囪喘閫�璐у崟")
+@Schema(name = "PurchaseReturnOrders瀵硅薄", description = "閲囪喘閫�璐у崟")
public class PurchaseReturnOrders implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,41 +35,84 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("閫�璐у崟缂栧彿")
+ @Schema(description = "閫�璐у崟缂栧彿")
private String no;
- @ApiModelProperty("閫�璐ф柟寮� 0閫�璐ч��娆� 1鎷掓敹")
+ @Schema(description = "閫�璐ф柟寮� 0閫�璐ч��娆� 1鎷掓敹")
private Integer returnType;
- @ApiModelProperty("渚涘簲鍟唅d")
+ @Schema(description = "渚涘簲鍟唅d")
private Long supplierId;
- @ApiModelProperty("椤圭洰id")
+ @Schema(description = "椤圭洰id")
private Long projectId;
- @ApiModelProperty("椤圭洰闃舵")
+ @Schema(description = "椤圭洰闃舵")
private Integer projectPhase;
- @ApiModelProperty("鍒跺崟鏃ユ湡")
- private LocalDateTime preparedAt;
+ @Schema(description = "鍒跺崟鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate preparedAt;
- @ApiModelProperty("鍒跺崟浜篿d")
+ @Schema(description = "鍒跺崟浜篿d")
private Long preparedUserId;
- @ApiModelProperty("閫�鏂欎汉id")
+ @Schema(description = "鍒跺崟浜哄悕绉�")
+ private String preparedUserName;
+
+ @Schema(description = "閫�鏂欎汉id")
private Long returnUserId;
- @ApiModelProperty("閲囪喘璁㈠崟id")
+ @Schema(description = "閫�鏂欎汉鍚嶇О")
+ private String returnUserName;
+
+ @Schema(description = "閲囪喘璁㈠崟id")
private Long purchaseLedgerId;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "'鏁村崟鎶樻墸棰�'")
+ private BigDecimal totalDiscountAmount;
+
+ @Schema(description = "'鏁村崟鎶樻墸鐜�'")
+ private BigDecimal totalDiscountRate;
+
+ @Schema(description = "'鎴愪氦閲戦'")
+ private BigDecimal totalAmount;
+
+ @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;
+
+ @Schema(description = "鏀跺叆绫诲瀷")
+ @TableField(value = "income_type")
+ private Integer incomeType;
+
+
+ /**
+ *
+ */
+ @TableField(value = "create_user",fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(value = "update_user",fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(value = "create_user_name", fill = FieldFill.INSERT)
+ private String createUserName;
+
+ @TableField(value = "update_user_name", fill = FieldFill.INSERT_UPDATE)
+ private String updateUserName;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3