add new function

new chenck function
Merge branch 'master' of https://github.com/Fangdl666/niot

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/dao/RecoDao.class
	source/niot/src/cn/niot/controller/RecoAction.java
update to fdl666
Merge branch 'xiaobaicoding-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/dao/RecoDao.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/util/RecoUtil.class
	source/niot/src/cn/niot/controller/RecoAction.java
	source/niot/src/cn/niot/dao/RecoDao.java
	source/niot/src/cn/niot/rule/RuleFunction.java