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

peng

8 天以前 62b3e99c68eb75a2c5cd86eb748534bd266ad009

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