Merge branch 'master' into gpdevelop
.
.
二维码
123
123
123
Test
删除Zbar，改为使用系统二维码扫描
.
.
Merge branch 'wl' into gpdevelop

Conflicts:
	KBLove.xcworkspace/xcshareddata/KBLove.xccheckout

KBLove.xcworkspace/xcuserdata/block.xcuserdatad/UserInterfaceState.xcuse
rstate

KBLove.xcworkspace/xcuserdata/block.xcuserdatad/xcdebugger/Breakpoints_v
2.xcbkptlist
.
.
Merge branch 'wl'

Conflicts:
	KBLove.xcworkspace/xcshareddata/KBLove.xccheckout

KBLove.xcworkspace/xcuserdata/block.xcuserdatad/UserInterfaceState.xcuse
rstate

KBLove.xcworkspace/xcuserdata/block.xcuserdatad/xcdebugger/Breakpoints_v
2.xcbkptlist
1
修改zbar 为系统自带二维码扫描
。
。
Merge branch 'wl' into gpdevelop