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

peng

7 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

 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);
@@ -23,4 +24,6 @@
    ActivityReportVO userReport(String activityId);

    Result detailByUsr(String activityId);


}