From d34a44a1ffa778c0a95027f67d56544b0faa4930 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 17:16:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperationParam.java | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperationParam.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperationParam.java
index 1f14947..2f3146a 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperationParam.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperationParam.java
@@ -1,88 +1,80 @@
package com.ruoyi.technology.pojo;
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
-/**
- * <p>
- * 鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟琛�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-04-20 10:22:16
- */
@Data
@TableName("technology_routing_operation_param")
-@ApiModel(value = "TechnologyRoutingOperationParam瀵硅薄", description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎宸ュ簭鍙傛暟琛�")
+@Schema(name = "TechnologyRoutingOperationParam瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鍙傛暟琛�")
public class TechnologyRoutingOperationParam implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("id")
+ @Schema(description = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭鍙傛暟琛╥d")
- private Long technologyRoutingOperationParamId;
-
- @ApiModelProperty("鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
+ @Schema(description = "鍙傛暟缂栫爜(鍞竴鏍囪瘑)")
private String paramCode;
- @ApiModelProperty("鍙傛暟鍚嶇О")
+ @Schema(description = "鍙傛暟鍚嶇О")
private String paramName;
- @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
+ @Schema(description = "鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
private Byte paramType;
- @ApiModelProperty("鍙傛暟鏍煎紡")
+ @Schema(description = "鍙傛暟鏍煎紡")
private String paramFormat;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏄惁蹇呭～")
+ @Schema(description = "鏄惁蹇呭～")
private Byte isRequired;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private String createUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("淇敼浜�")
+ @Schema(description = "淇敼浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("閮ㄩ棬ID")
+ @Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @ApiModelProperty("鍩虹鍙傛暟ID")
+ @Schema(description = "鍩虹鍙傛暟ID")
private Long paramId;
- @ApiModelProperty("宸ュ簭id")
+ @Schema(description = "宸ュ簭id")
private Long technologyOperationId;
- @ApiModelProperty("宸ュ簭鍙傛暟ID")
+ @Schema(description = "宸ュ簭鍙傛暟ID")
private Long technologyOperationParamId;
- @ApiModelProperty("宸ヨ壓璺嚎宸ュ簭ID")
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭ID")
private Long technologyRoutingOperationId;
- @ApiModelProperty("鏍囧噯鍊�")
+ @Schema(description = "鏍囧噯鍊�")
private String standardValue;
}
--
Gitblit v1.9.3