Merge branch 'dev' into send_coupon

peng

4 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

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