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

xiaoyong931011

2021-05-25 b787caa660c2aed5281d1429d5db2ec18ac8fa7c

 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);

}