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

peng

4 天以前 4372e6406222ce6b33f8c1c0703b460d39b5814e

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

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

    Result getCanReportPage(ActivityQuery query);

    /**
     * 列表
     * @return