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

peng

3 天以前 463add4ee035938f9622a6c981668620f097067d

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

@@ -15,6 +15,7 @@
 */
public interface PrizeActivityService extends IService<PrizeActivity> {

    Result publishPrizeActivity(String id);
    /**
     * 添加
     * @param form