From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java
index 7cbd045..133670f 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java
@@ -1,10 +1,8 @@
package com.ruoyi.technology.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -17,44 +15,43 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-04-20 10:06:17
*/
-@Getter
-@Setter
+@Data
@TableName("technology_bom_structure")
-@ApiModel(value = "TechnologyBomStructure瀵硅薄", description = "BOM浜у搧缁撴瀯琛�")
+@Schema(name = "TechnologyStructure瀵硅薄", description = "BOM浜у搧缁撴瀯琛�")
public class TechnologyBomStructure implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鐖惰妭鐐笽D")
+ @Schema(description = "鐖惰妭鐐笽D")
private Long parentId;
- @ApiModelProperty("浜у搧id")
+ @Schema(description = "浜у搧id")
private Long productModelId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long operationId;
- @ApiModelProperty("鍗曚綅浜у嚭闇�瑕佹暟閲�")
+ @Schema(description = "鍗曚綅浜у嚭闇�瑕佹暟閲�")
private BigDecimal unitQuantity;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲�")
private BigDecimal demandedQuantity;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("bom鐨刬d")
+ @Schema(description = "bom鐨刬d")
private Long bomId;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
--
Gitblit v1.9.3