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

zxl

4 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

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

@@ -18,4 +18,7 @@

    Result addPrizeNum(AddPrizeNumForm addPrizeNumForm);

    Result getPrizeRule();


}