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

peng

4 天以前 1fdfb56613adca09a0ddf39289b41f96fa335a01

 buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java

@@ -2,6 +2,7 @@

import cn.lili.base.Result;
import cn.lili.common.security.context.UserContext;
import cn.lili.modules.lmk.domain.form.ActivityForm;
import cn.lili.modules.lmk.domain.form.ActivityReportForm;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.service.ActivityService;
@@ -41,4 +42,6 @@
    public Result getActivityDetail(@PathVariable String activityId){
        return myActivityService.detailByUsr(activityId);
    }


}