# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/entity/Contact.java
#	src/main/java/cn/quantgroup/xyqb/service/user/impl/ContactServiceImpl.java