me
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
me
Change-Id: I64a01b74737e362421ffbce8380fe3c44879e3b1
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-service/pom.xml
Change-Id: I9e9e822cedbc9975046bd868b9be06e2479d908b
Change-Id: I7e4124815245cef0093afd458450cbe293a60bb8
me
me
me
Signed-off-by: qjj <qjj@126.com>
Change-Id: I9c0f8315ebdedc203ba1a0221335ab8ac8b4b767
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-manager/src/main/java/com/sxj/supervisor/manage/controller/rfid/RfidSupplierController.java
	supervisor-parent/supervisor-manager/src/main/webapp/WEB-INF/views/fm/manage/rfid/supplier/supplier.html
Change-Id: I3cbe76e5590a1c44a660482178865bf69c277916
Change-Id: I34f5424e0f3536347d338e222e88cf5f6090f9df
me
me
dfdf
dfdf
Signed-off-by: djx <dujinxin1330@163.com>