developer

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

log

See merge request !289

Master xgh pendingid

See merge request !288

Master xgh pendingid

See merge request !287

Master xgh pendingid

See merge request !286

Master xgh pendingid

See merge request !285

加好友整理

See merge request !284

Master xgh pendingid

See merge request !283

Master xgh 博格瑞绝色bug

See merge request !282

log

See merge request !279