Change-Id: If49f16f4385186a02ef64ec467739c890c9c3d3d
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
me
Signed-off-by: Ann <Ann@An-PC>
Merge branch 'master' of scm@192.168.1.10:/home/scm/repositories/sxj-src.git
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-website/src/main/java/com/sxj/supervisor/website/controller/rfid/apply/ApplyController.java
	supervisor-parent/supervisor-website/src/main/java/com/sxj/supervisor/website/controller/rfid/applyManager/ApplyManagerController.java
	supervisor-parent/supervisor-website/src/main/java/com/sxj/supervisor/website/controller/rfid/mencordermgr/MencordermgrController.java
	supervisor-parent/supervisor-website/src/main/webapp/WEB-INF/views/fm/site/rfid/mencordermgr/mencordermgr.html
	supervisor-parent/supervisor-website/src/main/webapp/WEB-INF/views/fm/site/rfid/new-mencorder/new-mencorder.html
	supervisor-parent/supervisor-website/src/main/webapp/WEB-INF/views/fm/site/rfid/rfidApply/new-gysorder.html