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/ProductionProductMain.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index 5bd20c0..3dbe688 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -1,9 +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.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,7 +10,7 @@
@TableName("production_product_main")
public class ProductionProductMain {
- @TableId
+ @TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "鎶ュ伐鍗曞彿")
@@ -23,15 +20,17 @@
private Long userId;
@ApiModelProperty(value = "鎶ュ伐浜哄憳")
- private Long userName;
+ private String userName;
+
+ @ApiModelProperty(value = "鐢熶骇椤圭洰id")
+ private Long productProcessRouteItemId;
@ApiModelProperty(value = "宸ュ崟id")
- private String productProcessRouteItemId;
+ private Long workOrderId;
@ApiModelProperty(value = "鎶ュ伐鐘舵��")
private Integer status;
- @TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
--
Gitblit v1.9.3