Master xgh bug 11月 See merge request !368
忽略type=2的加好友 See merge request !359
Developer See merge request !348
test See merge request !347
Developer See merge request !346
