Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml

@@ -41,6 +41,9 @@
 			<if test="serviceName != null and serviceName != ''">
 				and ssi.service_name like CONCAT('%', #{serviceName}, '%')
 			</if>
+			<if test="serviceId != null and serviceId != ''">
+				and ssi.service_id like CONCAT('%', #{serviceId}, '%')
+			</if>
 			<if test="action != null">
 				and ssi.action=#{action}
 			</if>