From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
index 405358a..9e68bbf 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import tools.jackson.databind.annotation.JsonSerialize;
-import tools.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -153,7 +153,7 @@
@Schema(description = "鍨嬪彿")
private String model;
- @Schema(description = "鍨嬪彿")
+ @Schema(description = "妯℃澘id")
private Integer templateId;
@Schema(description = "")
@@ -187,6 +187,7 @@
private String tree;
+ @Schema(description = "妫�楠岄」id")
private Integer structureItemParameterId;
@Schema(description = "妫�楠岄」鍒嗙被")
--
Gitblit v1.9.3