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

zxl

6 天以前 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec

 framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityRefPrizeMapper.java

@@ -32,6 +32,8 @@
    */
    IPage getPage(IPage page, @Param("query") ActivityRefPrizeQuery query);

    String lockPrizeRef(@Param("refId") String refId);;


    List<ActivityRefPrizeInfoVO> getActivityRefPrizeByActivityId(String prizeActivityId);
}