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/production/bean/dto/ProductStructureDto.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductStructureDto.java
index 9c0cdcf..85f28d1 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductStructureDto.java
@@ -1,6 +1,6 @@
package com.ruoyi.production.bean.dto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -8,26 +8,26 @@
@Data
public class ProductStructureDto {
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
private Long id;
- @ApiModelProperty("BOM涓婚敭ID")
+ @Schema(description = "BOM涓婚敭ID")
private Long bomId;
- @ApiModelProperty("鐖剁骇ID")
+ @Schema(description = "鐖剁骇ID")
private Long parentId;
- @ApiModelProperty("浜у搧鍨嬪彿ID")
+ @Schema(description = "浜у搧鍨嬪彿ID")
private Long productModelId;
- @ApiModelProperty("鍗曚綅鐢ㄩ噺")
+ @Schema(description = "鍗曚綅鐢ㄩ噺")
private BigDecimal unitQuantity;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("宸ュ簭ID")
+ @Schema(description = "宸ュ簭ID")
private Long processId;
- @ApiModelProperty("宸ュ簭鍚嶇О")
+ @Schema(description = "宸ュ簭鍚嶇О")
private String processName;
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String model;
- @ApiModelProperty("瀛愯妭鐐�")
+ @Schema(description = "瀛愯妭鐐�")
private List<ProductStructureDto> children;
}
--
Gitblit v1.9.3