Signed-off-by: qjj <qjj@126.com>
Signed-off-by: Ann <Ann@An-PC>
me
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: I373c52fba672a92e4bd535ebf8c9874661030cf4
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: I02aa54777a208018018aa09967a48ced6c11312f
Change-Id: I8ff6f90c2f7779b0b83bb322bd8c7420b48a7ee9
me
me
Change-Id: I4de6958a91c7bab68bf6d12793fccbb7fbdd7d7f
Change-Id: I35ab0e81e768cbccb82fb6eb6534354cfb483dd0
Change-Id: I7dc26324be39622bea68e06b79713b8800ecbc8a
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Signed-off-by: Ann <Ann@An-PC>
fdfd
fdfd
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	rfid-parent/rfid-dao/src/main/java/com/sxj/supervisor/entity/rfid/purchase/RfidPurchaseEntity.java
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-dao/src/main/resources/mapper/system/FunctionMapper.xml