忽略type=2的加好友 See merge request !359
Developer See merge request !348
test See merge request !347
Developer See merge request !346
延时 See merge request !345
Developer See merge request !344
Master See merge request !343
Developer See merge request !342
会员合并 See merge request !341
log See merge request !340
好办延时调用 See merge request !339
会员换绑 See merge request !338
Feature haoban role See merge request !336
欢迎语条数限制 See merge request !335
# Conflicts: # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java
