diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java
index 0fad019c..84e3af29 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java
@@ -50,7 +50,18 @@ public class MaPropInfoController  extends BaseController {
         List<MaPropInfo> list = maPropInfoService.selectMaPropInfoList(propName);
         return getDataTable(list);
     }
-
+    /**
+     * 查询资产属性列表
+     * @param查询资产属性列表
+     * @return
+     */
+    @GetMapping("/lists")
+    @ApiOperation(value = "查询资产属性列表")
+    public TableDataInfo list()
+    {
+        List<MaPropInfo> list = maPropInfoService.selectMaPropInfoLists();
+        return getDataTable(list);
+    }
     /**
      * 新建资产属性
      * @param maPropInfo
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java
index af6fcad3..7e00070b 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaPropInfoMapper.java
@@ -18,7 +18,12 @@ public interface MaPropInfoMapper {
      * @return
      */
     List<MaPropInfo> selectMaPropSet(String propName);
-
+    /**
+     * 根据资产名称查询资产名称列表
+     * @param
+     * @return
+     */
+    List<MaPropInfo> selectMaPropSets();
     /**
      * 校验资产项目名称唯一性
      * @param propName
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java
index 79a8e0a4..29afcf60 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaPropInfoService.java
@@ -18,7 +18,12 @@ public interface IMaPropInfoService {
      * @return
      */
     List<MaPropInfo> selectMaPropInfoList(String propName);
-
+    /**
+     * 查询资产属性列表
+     * @param
+     * @return
+     */
+    List<MaPropInfo> selectMaPropInfoLists();
     /**
      * 校验资产项目名称唯一性
      * @param maPropInfo
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java
index 0581a433..963a0197 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java
@@ -39,7 +39,15 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService {
     public List<MaPropInfo> selectMaPropInfoList(String propName) {
         return maPropInfoMapper.selectMaPropSet(propName);
     }
-
+    /**
+     * 查询资产属性列表
+     * @param
+     * @return
+     */
+    @Override
+    public List<MaPropInfo> selectMaPropInfoLists() {
+        return maPropInfoMapper.selectMaPropSets();
+    }
     /**
      * 校验资产项目名称唯一性
      * @param maPropInfo
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
index 318e81d2..1d7c2087 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPropInfoMapper.xml
@@ -82,7 +82,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
-
+    <select id="selectMaPropSets" resultType="com.bonus.sgzb.base.domain.MaPropInfo" resultMap="MaPropInfoResult">
+        select prop_id, prop_name
+        from ma_prop_info
+        <where> del_flag = '0'
+            <if test="propName != null and propName != ''">
+                AND a.prop_name like concat('%', #{propName}, '%')
+            </if>
+        </where>
+    </select>
     <select id="checkPropNameUnique" resultType="com.bonus.sgzb.base.domain.MaPropInfo" resultMap="MaPropInfoResult">
         <include refid="selectMaPropInfoVo"/>
         where prop_name = #{propName} limit 1