# Conflicts: # CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java # CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpActivity.java # CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java # CODE/smart-community/app-api/src/main/resources/mapper/TpActivitySignupMapper.xml