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

peng

3 天以前 463add4ee035938f9622a6c981668620f097067d

 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);
}