Merge branch 'develop_station' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_station

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -366,7 +366,7 @@ WHERE wles.id=#{id}
         SELECT
         si.id,
         si.equipment_specific_id AS equipmentId,
-       	IFNULL(si.value_label, si.`value`) AS 'value',
+       	IF(si.value_label='' OR si.value_label is null,si.`value`,si.value_label) AS 'value',
         si.create_date,
         si.update_date
         FROM