Merge branch 'test' into dev_power_axis

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml

@@ -30,7 +30,7 @@
             pli_power_service_station
         WHERE
 	        STRUCT_REFERENCE_ID in
-	        (select DISTINCT s.id from pli_power_axis_struct s where  (s.ID = 'axisStructId' or s.PIDS like '%axisStructId%') and s.del_flag = '0')
+	        (select DISTINCT s.id from pli_power_axis_struct s where  (s.ID = #{axisStructId} or s.PIDS like '%${axisStructId}%') and s.del_flag = '0')
 	    and
 	        CUSTOMER_ID = #{customerId}
 	    limit #{limit}