From 2683793796366a4b6361baf4a16e5c65c8dce068 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 四月 2026 16:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index 3d1a032..32cc976 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -1,43 +1,59 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-@Data
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐浜у嚭琛�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-04-21 03:55:52
+ */
+@Getter
+@Setter
@TableName("production_product_output")
-public class ProductionProductOutput {
+@ApiModel(value = "ProductionProductOutput瀵硅薄", description = "鐢熶骇鎶ュ伐浜у嚭琛�")
+public class ProductionProductOutput implements Serializable {
- @TableId(type = IdType.AUTO)
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鎶ュ伐id")
- private Long productMainId;
+ @ApiModelProperty("鎶ュ伐鍗昳d")
+ private Long productionProductMainId;
- @ApiModelProperty(value = "浜у搧id")
+ @ApiModelProperty("浜у搧瑙勬牸id")
private Long productModelId;
- @ApiModelProperty(value = "鎶ュ伐鏁伴噺(鎬绘暟閲�)")
+ @ApiModelProperty("鎶ュ伐鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ApiModelProperty("鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("鍒涘缓浜篒D")
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @ApiModelProperty("褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "绉熸埛ID")
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
- @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
- private BigDecimal scrapQty;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @TableField(fill = FieldFill.INSERT)
- private Long deptId;
-
+ @ApiModelProperty("鏇存柊鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updateUser;
}
--
Gitblit v1.9.3