Merge remote-tracking branch 'origin/send_coupon' into send_coupon

peng

2 天以前 904812187f2fb4eafc9071458f3a91d3f7b7748a

 framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java

@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.IService;

public interface MyActivityService extends IService<Activity> {

    public Result getMyActivityList(MyActivityQuery query);

    public Result activityCancel(String activityId);