From 2a9c3934bb093c978a54a1c3e220e6a120855e77 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 09 一月 2026 15:11:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
index 6502a33..c938170 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
@@ -1,8 +1,6 @@
 package com.ruoyi.production.pojo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,13 +8,14 @@
 import java.time.LocalDateTime;
 
 @Data
+@TableName("production_product_input")
 public class ProductionProductInput {
 
-    @TableId
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty(value = "鎶ュ伐id")
-    private Long productionProductId;
+    private Long productMainId;
 
     @ApiModelProperty(value = "浜у搧id")
     private Long productModelId;

--
Gitblit v1.9.3