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

peng

3 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java

@@ -58,5 +58,9 @@
     /** 是否开启活动 */
    private String enableStatus;


    @TableField("popup")
    /**
     * 是否是弹窗活动
     */
    private Boolean popup;
}