From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionBomStructure.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionBomStructure.java b/src/main/java/com/ruoyi/production/pojo/ProductionBomStructure.java
index a70c057..5ba8d22 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionBomStructure.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionBomStructure.java
@@ -1,8 +1,8 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -17,47 +17,46 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-04-21 03:55:52
*/
-@Getter
-@Setter
+@Data
@TableName("production_bom_structure")
-@ApiModel(value = "ProductionBomStructure瀵硅薄", description = "鐢熶骇璁㈠崟BOM浜у搧缁撴瀯")
+@Schema(name = "ProductionBomStructure瀵硅薄", description = "鐢熶骇璁㈠崟BOM浜у搧缁撴瀯")
public class ProductionBomStructure 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 productionOrderId;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @ApiModelProperty("鐢熶骇璁㈠崟BOMid")
+ @Schema(description = "鐢熶骇璁㈠崟BOMid")
private Long productionOrderBomId;
- @ApiModelProperty("鍗曚綅浜у嚭闇�瑕佹暟閲�")
+ @Schema(description = "鍗曚綅浜у嚭闇�瑕佹暟閲�")
private BigDecimal unitQuantity;
- @ApiModelProperty("闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲�")
private BigDecimal demandedQuantity;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @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