APP查询属性名称修改

sms_water/src/main/resources/mapper/DeviceParmMapper.xml

@@ -77,7 +77,7 @@
                     ,p.CREATE_BY as "createBy"
                     ,p.DATE_UPDATE as "dateUpdate"
                     ,p.UPDATE_BY as "updateBy"
-                    ,b.`NAME` as "attributeName"
+                    ,ifnull(p.REMARK,b.`NAME`) as "attributeName"
                     ,p.PARM_TYPE as "parmType"
                     ,a.device_code as "deviceCode"
         from sms_device_parm p