From 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 19:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java
index 019bc22..c81e401 100644
--- a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java
@@ -1,15 +1,15 @@
package com.ruoyi.technology.bean.vo;
import com.ruoyi.technology.pojo.TechnologyBom;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class TechnologyBomVo extends TechnologyBom {
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String productModelName;
}
--
Gitblit v1.9.3