From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index a4326a6..0fa00eb 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -1,11 +1,11 @@
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 io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -13,36 +13,47 @@
@TableName("production_product_main")
public class ProductionProductMain {
- @TableId
+ @TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鎶ュ伐鍗曞彿")
+ @Schema(description = "鎶ュ伐鍗曞彿")
+ @Excel(name = "鎶ュ伐鍗曞彿")
private String productNo;
- @ApiModelProperty(value = "鎶ュ伐浜哄憳id")
+ @Schema(description = "鎶ュ伐浜哄憳id")
private Long userId;
- @ApiModelProperty(value = "鎶ュ伐浜哄憳")
+ @Schema(description = "鎶ュ伐浜哄憳")
private String userName;
- @ApiModelProperty(value = "鐢熶骇椤圭洰id")
- private Long productProcessRouteItemId;
+ @Schema(description = "鐢熶骇宸ュ簭宸ュ崟id")
+ private Long productionOperationTaskId;
- @ApiModelProperty(value = "宸ュ崟id")
- private Long workOrderId;
-
- @ApiModelProperty(value = "鎶ュ伐鐘舵��")
+ @Schema(description = "鎶ュ伐鐘舵��")
private Integer status;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.UPDATE)
+ @Schema(description = "鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
- private Long tenantId;
+ private Integer createUser;
+
+ @Schema(description = "鏇存柊鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3