Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding

xiaoyong931011

2021-05-12 a65df41c3243877352fe6822b65c1836ddc3c19d

 src/main/java/com/xcong/excoin/modules/activity/service/ActivityService.java

@@ -6,6 +6,10 @@

public interface ActivityService extends IService<ActivityMain> {

   Result getActivityMainList();
   Result getActivityMain();

   Result getActivityMainDetail(long id);

   Result clinkReceive(long subId);

}