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

zxl

2 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

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