Change-Id: I2973d6ca5b49d5775bf1066ff4132f63289f2607
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: I2aaab68365f50323bc5797e7b0e7ad36a1dc8d07
Change-Id: I2822bb1913e4739d5132ce70a18d21c7f6805f95
me
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: Ibfdfdb0f33668397eae4dc7c3d591a8550a8e71d
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/applyManager/ApplyManagerController.java
	supervisor-parent/supervisor-website/src/main/java/com/sxj/supervisor/website/controller/rfid/applyMencorder/ApplyMencorder.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/applyManager/gysordermgr.html
	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
message
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: Ia083667b887e9bcb8eca52ed3ca98a4820a84fca
Change-Id: Id90146d3afbbfa6fa88971122a136b7ca7cdd424
Merge branch 'master' of scm@192.168.1.10:/home/scm/repositories/sxj-src.git
Signed-off-by: Ann <Ann@An-PC>
Change-Id: Ic1c515f2efc08594a70f3f770fb482d4787347f5
Signed-off-by: Ann <Ann@An-PC>
Merge branch 'master' of scm@192.168.1.10:/home/scm/repositories/sxj-src.git
Signed-off-by: djx <dujinxin1330@163.com>
Signed-off-by: qjj <qjj@126.com>
me