Change-Id: I953ee2d63eddb404240a8c205c6734d803a1bc2b
dasdad
me
me
Change-Id: I1cf348f396420f7eb171b3944b0128ce50cb0563
Signed-off-by: qjj <qjj@126.com>
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	rfid-parent/rfid-website/pom.xml
	rfid-parent/rfid-website/src/main/java/com/sxj/supervisor/open/controller/OpenRfidController.java
	rfid-parent/rfid-website/src/main/resources/mybatis/mybatis-config.xml
Change-Id: I8931cec56e235fd78dd4cd5bcb8d126f7c455a1e
Change-Id: I9d5e4727e42629e11c324477abb4fe18ae8d48b3
Change-Id: I21c3c7dd4f0bdde824cafe46b5a846103c1ff59c
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	rfid-parent/rfid-website/src/main/java/com/sxj/supervisor/open/controller/OpenRfidController.java
Signed-off-by: Ann <Ann@An-PC>
me
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	rfid-parent/rfid-website/src/main/java/com/sxj/supervisor/open/controller/OpenRfidController.java
me
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	rfid-parent/rfid-website/src/main/java/com/sxj/supervisor/open/controller/OpenRfidController.java
	rfid-parent/rfid-website/src/main/resources/mybatis/mybatis-config.xml
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: If5982bc5ac4ef32930037a9ffd4659cb9427e9b6
Change-Id: I179e41a8ebc84fe61ea875661b0eeb25353179aa
message