diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java
index e6f72bb..92782a7 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 装备特征值管理
  */
 @RestController
-@RequestMapping("/equipment/type/property")
+@RequestMapping("/equipment/property")
 public class EquipmentPropertyController {
 
     @Autowired
@@ -96,7 +96,7 @@ public class EquipmentPropertyController {
      * 删除特征值
      */
     @DeleteMapping("/{id}")
-    public AjaxResult delete(@PathVariable Integer id) {
+    public AjaxResult delete(@PathVariable Long id) {
         equipmentPropertyService.delete(id);
         return AjaxResult.success();
     }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java
index 6dc71c3..b15222b 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java
@@ -4,26 +4,27 @@ import com.bonus.material.devConfig.domain.EquipmentProperty;
 import com.bonus.material.devConfig.domain.EquipmentPropertyDTO;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface EquipmentPropertyMapper {
-    void deleteById(Integer id);
+    void deleteById(@Param("id") Long id);
 
     void update(EquipmentProperty equipmentProperty);
 
     void insert(EquipmentProperty equipmentProperty);
 
-    List<EquipmentProperty> selectByTypeId(Long typeId);
+    List<EquipmentProperty> selectByTypeId(@Param("typeId") Long typeId);
 
-    EquipmentProperty selectById(Long id);
+    EquipmentProperty selectById(@Param("typeId") Long id);
 
     List<EquipmentProperty> selectAll();
 
 
     // 新增关联查询方法
-    List<EquipmentPropertyDTO> selectTypeWithProperties(Long typeId);
+    List<EquipmentPropertyDTO> selectTypeWithProperties(@Param("typeId") Long typeId);
     List<EquipmentPropertyDTO> selectAllTypesWithProperties();
-    EquipmentPropertyDTO selectTypeDetailWithProperties(Long typeId);
+    EquipmentPropertyDTO selectTypeDetailWithProperties(@Param("typeId") Long typeId);
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/EquipmentPropertyService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/EquipmentPropertyService.java
index 6c0dab9..aed53b4 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/EquipmentPropertyService.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/EquipmentPropertyService.java
@@ -16,7 +16,7 @@ public interface EquipmentPropertyService {
 
     void update(EquipmentProperty equipmentProperty);
 
-    void delete(Integer id);
+    void delete(Long id);
 
     List<EquipmentPropertyDTO> getTypeWithProperties(Long typeId);
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java
index 5417ed5..72b83ea 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java
@@ -49,7 +49,7 @@ public class EquipmentPropertyServiceImpl implements EquipmentPropertyService {
     }
 
     @Override
-    public void delete(Integer id) {
+    public void delete(Long id) {
         equipmentPropertyMapper.deleteById(id);
     }
 
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml
index 10e821e..efe8c8a 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml
@@ -68,22 +68,30 @@
 
     <!-- 查询所有特征值 -->
     <select id="selectAll" resultMap="EquipmentPropertyResult">
-        SELECT id, type_id, must_have, input_type, property_name, property_value, create_time
-        FROM equipment_property
+        SELECT
+            MIN(id) as id,
+            '' as type_id,
+            must_have,
+            input_type,
+            property_name,
+            '' as property_value,
+            MAX(create_time) as create_time
+        FROM ma_type_properties
+        GROUP BY property_name
         ORDER BY create_time DESC
     </select>
 
     <!-- 根据ID查询特征值 -->
-    <select id="selectById" parameterType="java.lang.Integer" resultMap="EquipmentPropertyResult">
+    <select id="selectById"  resultMap="EquipmentPropertyResult">
         SELECT id, type_id, must_have, input_type, property_name, property_value, create_time
-        FROM equipment_property
+        FROM ma_type_properties
         WHERE id = #{id}
     </select>
 
     <!-- 根据类型ID查询特征值 -->
-    <select id="selectByTypeId" parameterType="java.lang.Integer" resultMap="EquipmentPropertyResult">
+    <select id="selectByTypeId" resultMap="EquipmentPropertyResult">
         SELECT id, type_id, must_have, input_type, property_name, property_value, create_time
-        FROM equipment_property
+        FROM ma_type_properties
         WHERE type_id = #{typeId}
         ORDER BY create_time DESC
     </select>
@@ -104,8 +112,8 @@
             ep.property_name,
             ep.property_value,
             ep.create_time as property_create_time
-        FROM equipment_type et
-                 LEFT JOIN equipment_property ep ON et.type_id = ep.type_id
+        FROM ma_type et
+                 LEFT JOIN ma_type_propertis ep ON et.type_id = ep.type_id
         WHERE et.type_id = #{typeId}
         ORDER BY ep.create_time DESC
     </select>
@@ -126,8 +134,8 @@
             ep.property_name,
             ep.property_value,
             ep.create_time as property_create_time
-        FROM equipment_type et
-                 LEFT JOIN equipment_property ep ON et.type_id = ep.type_id
+        FROM ma_type et
+                 LEFT JOIN ma_type_properties ep ON et.type_id = ep.type_id
         WHERE et.status = '0'
         ORDER BY et.type_id, ep.create_time DESC
     </select>
@@ -149,8 +157,8 @@
             ep.property_name,
             ep.property_value,
             ep.create_time
-        FROM equipment_type et
-                 LEFT JOIN equipment_property ep ON et.type_id = ep.type_id
+        FROM ma_type et
+                 LEFT JOIN ma_type_properties ep ON et.type_id = ep.type_id
         WHERE et.type_id = #{typeId}
         ORDER BY ep.create_time DESC
     </select>
@@ -158,7 +166,7 @@
     <!-- 新增特征值 -->
     <insert id="insert" parameterType="com.bonus.material.devConfig.domain.EquipmentProperty"
             useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO equipment_property (
+        INSERT INTO ma_type_properties (
             type_id,
             must_have,
             input_type,
@@ -177,7 +185,7 @@
 
     <!-- 更新特征值 -->
     <update id="update" parameterType="com.bonus.material.devConfig.domain.EquipmentProperty">
-        UPDATE equipment_property
+        UPDATE ma_type_properties
         <set>
             <if test="typeId != null">type_id = #{typeId},</if>
             <if test="mustHave != null and mustHave != ''">must_have = #{mustHave},</if>
@@ -189,8 +197,8 @@
     </update>
 
     <!-- 根据ID删除特征值 -->
-    <delete id="deleteById" parameterType="java.lang.Integer">
-        DELETE FROM equipment_property
+    <delete id="deleteById" >
+        DELETE FROM ma_type_properties
         WHERE id = #{id}
     </delete>