From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 65 ++++++++++++++------------------
1 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index 32cc976..5e1daef 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -1,59 +1,50 @@
package com.ruoyi.production.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;
import java.time.LocalDateTime;
-/**
- * <p>
- * 鐢熶骇鎶ュ伐浜у嚭琛�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-04-21 03:55:52
- */
-@Getter
-@Setter
+@Data
@TableName("production_product_output")
-@ApiModel(value = "ProductionProductOutput瀵硅薄", description = "鐢熶骇鎶ュ伐浜у嚭琛�")
-public class ProductionProductOutput implements Serializable {
+public class ProductionProductOutput {
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鎶ュ伐鍗昳d")
+ @Schema(description = "鎶ュ伐id")
+ private Long productMainId;
+
+ @Schema(description = "鐢熶骇鎶ュ伐涓昏〃id")
private Long productionProductMainId;
- @ApiModelProperty("浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧id")
private Long productModelId;
- @ApiModelProperty("鎶ュ伐鏁伴噺")
+ @Schema(description = "鍚堟牸鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty("鎶ュ簾鏁伴噺")
- private BigDecimal scrapQty;
-
- @ApiModelProperty("鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty("鍒涘缓浜篒D")
- @TableField(fill = FieldFill.INSERT)
- private Long createUser;
-
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鐢ㄦ埛")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
- private Long updateUser;
+ private LocalDateTime updateTime;
+
+ @Schema(description = "鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @Schema(description = "鏇存柊鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3