From ec1f20c31d64ddbc5242c3942902bc5233a8a140 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 四月 2025 10:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
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