user冲突, pt/bt交互(待完善版)

Change-Id: I7530921962ac82ad1a896ae3c120416256f787e0
11 files changed