From 1625099c3abe6b900e1d22dbce26aa1deefff118 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 10 Dec 2024 17:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/device/domain/vo/DevInfoPropertyVo.java    | 4 ----
 .../main/resources/mapper/material/device/DevInfoMapper.xml   | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoPropertyVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoPropertyVo.java
index 316091c..eb2c688 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoPropertyVo.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoPropertyVo.java
@@ -6,10 +6,6 @@ import lombok.Data;
 @Data
 public class DevInfoPropertyVo {
 
-    /** 物资ID */
-    @ApiModelProperty(value = "物资ID")
-    private Long maId;
-
     /** 属性名称 */
     @ApiModelProperty(value = "属性名称")
     private String propertyName;
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index 754f0c4..d81161c 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -532,8 +532,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectDevInfoProperties" resultType="com.bonus.material.device.domain.vo.DevInfoPropertyVo">
-        select ma_id as maId,
-               property_name as propertyName,
+        select property_name as propertyName,
                property_value as propertyValue
         from ma_dev_info_properties
         where ma_id = #{maId}