From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
index ec2ef8b..f91f1e1 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
@@ -1,8 +1,7 @@
package com.ruoyi.technology.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;
@@ -18,7 +17,7 @@
*/
@Data
@TableName("technology_routing_operation")
-@ApiModel(value = "TechnologyRoutingOperation瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭琛�")
+@Schema(name = "TechnologyRoutingOperation瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭琛�")
public class TechnologyRoutingOperation implements Serializable {
private static final long serialVersionUID = 1L;
@@ -26,34 +25,37 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("宸ヨ壓璺嚎id")
+ @Schema(description = "宸ヨ壓璺嚎id")
private Long technologyRoutingId;
- @ApiModelProperty("浜у搧id")
+ @Schema(description = "浜у搧id")
private Long productModelId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @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 Integer dragSort;
- @ApiModelProperty("鏄惁璐ㄦ宸ュ簭")
+ @Schema(description = "鏄惁璐ㄦ宸ュ簭")
private Boolean isQuality;
- @ApiModelProperty("鍒涘缓浜篒D")
+ @Schema(description = "鏄惁鐢熶骇")
+ private Boolean isProduction;
+
+ @Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
--
Gitblit v1.9.3