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

src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml

@@ -209,6 +209,9 @@
 	 		<if test="cfgId != null">
 	   			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
 	   		</if>
+	 		<if test="compileId != null">
+	   			AND r.compile_id=#{compileId,jdbcType=BIGINT}
+	   		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>