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

xiaoyong931011

2021-05-15 a8b2538db7172cc108b0a5387ea7c0da18046049

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

}