update function 1 for one result; update function 2; change result color
Merge branch 'xiaobaicoding-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/IoTIDRecognitionAction.class
	source/niot/WebRoot/js/zt_function_1.js
	source/niot/src/cn/niot/controller/IoTIDRecognitionAction.java