# Conflicts:
#	liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/RedisKeyExpireConst.java
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

过滤掉护照专属商品

See merge request !414

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

修改名称、副标题 长度限制

See merge request !413

Dev caomeihuizhang

See merge request !412

从 user/tpa/bind 撤回 QQ 特判；在 register(AdamThirdPartParam) 中手机号已注册且已绑 QQ 但 openId 变化时解绑后重绑，新 openId 已被他人占用则返回 10007。

Made-with: Cursor

撤销误提交的杂项文件后，仅保留 bindTpa 中 QQ 平台先解绑再绑定的逻辑。

Made-with: Cursor