-
http://113.105.137.151:22280/youjj/cloud-platformhezhen authored
# Conflicts: # xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/feign/ActivityFeign.java
dc5b09db
# Conflicts: # xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/feign/ActivityFeign.java