From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java b/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
index 99f852a..5ae58d9 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -20,58 +19,61 @@
*/
@Data
@TableName("production_operation_task")
-@ApiModel(value = "ProductionOperationTask瀵硅薄", description = "鐢熶骇宸ュ崟琛�")
+@Schema(name = "ProductionOperationTask瀵硅薄", description = "鐢熶骇宸ュ崟琛�")
public class ProductionOperationTask implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("id")
+ @Schema(description = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭琛╥d")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭琛╥d")
private Long technologyRoutingOperationId;
- @ApiModelProperty("褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("宸ュ崟缂栧彿")
+ @Schema(description = "宸ュ崟缂栧彿")
private String workOrderNo;
- @ApiModelProperty("璁″垝寮�濮嬫椂闂�")
+ @Schema(description = "璁″垝寮�濮嬫椂闂�")
private LocalDate planStartTime;
- @ApiModelProperty("璁″垝缁撴潫鏃堕棿")
+ @Schema(description = "璁″垝缁撴潫鏃堕棿")
private LocalDate planEndTime;
- @ApiModelProperty("瀹為檯寮�濮嬫椂闂�")
+ @Schema(description = "瀹為檯寮�濮嬫椂闂�")
private LocalDate actualStartTime;
- @ApiModelProperty("瀹為檯缁撴潫鏃堕棿")
+ @Schema(description = "瀹為檯缁撴潫鏃堕棿")
private LocalDate actualEndTime;
- @ApiModelProperty("鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�")
+ @Schema(description = "鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�")
private Integer status;
- @ApiModelProperty("鐢熶骇璁㈠崟id")
+ @Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
- @ApiModelProperty("璁″垝鏁伴噺")
+ @Schema(description = "璁″垝鏁伴噺")
private BigDecimal planQuantity;
- @ApiModelProperty("瀹屾垚鏁伴噺")
+ @Schema(description = "瀹屾垚鏁伴噺")
private BigDecimal completeQuantity;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @Schema(description = "鏉冮檺鐢ㄦ埛ID鍒楄〃锛屾牸寮忥細[1,2,3]銆傛寚瀹氬涓敤鎴稩D鏃讹紝鐢ㄩ�楀彿鍒嗛殧銆�")
+ private String userIds;
}
--
Gitblit v1.9.3