From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 30 ------------------------------
1 files changed, 0 insertions(+), 30 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 1c1b79f..8ef2c73 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
@@ -100,12 +100,6 @@
private String section;
/**
- * 鍖洪棿
- */
- @ApiModelProperty("鑺暟鍖洪棿")
- private String cores;
-
- /**
* 鏂规硶
*/
@ApiModelProperty("鏂规硶鍒楄〃")
@@ -194,28 +188,4 @@
@ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
private String inspectionItemClassEn;
-
- @ApiModelProperty(value = "鏉′欢")
- private String radius;
-
- @ApiModelProperty(value = "鏉′欢鍒楄〃")
- private String radiusList;
-
- @ApiModelProperty(value = "鏀惰垂鏍囧噯(鍏�/娆�)")
- private String rates;
-
- @ApiModelProperty(value = "绱㈠紩椤哄簭")
- private Integer sort;
-
- /**
- * 瀵间綋鏉愯川
- */
- @ApiModelProperty("瀵间綋鏉愯川")
- private String conductorMaterial;
-
- /**
- * 瀵间綋绫诲瀷
- */
- @ApiModelProperty("瀵间綋绫诲瀷")
- private String conductorType;
}
--
Gitblit v1.9.3