From fe2d7c404c69700404814e18a70d5e606916486b Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 24 七月 2025 15:04:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns
---
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 6 ------
1 files changed, 0 insertions(+), 6 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 392fe36..fd0d620 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
@@ -219,10 +219,4 @@
*/
@ApiModelProperty("瀵间綋绫诲瀷")
private String conductorType;
-
- @ApiModelProperty("structure_test_object琛╥d")
- private Integer structureTestObjectId;
-
- @ApiModelProperty("product 浜у搧id")
- private Integer productId;
}
--
Gitblit v1.9.3