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

peng

7 天以前 61c5deee6619789d3a2711684ea14cc51b061cdf

 framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java

@@ -23,4 +23,6 @@
    ActivityReportVO userReport(String activityId);

    Result detailByUsr(String activityId);


}