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

peng

4 天以前 aac2321d1cf5536f7ea03f30d55a4aba30fbf710

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

@@ -56,6 +56,8 @@
     */
    Result detail(String id);

    Result getCanReportPage(ActivityQuery query);

    /**
     * 列表
     * @return