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

peng

4 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

 framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeActivityStatusEnum.java

@@ -17,7 +17,7 @@
    /**
     * 抽奖活动状态
     */
    OFF("off"),
    ON("on");
    OFF("关闭"),
    ON("开启");
    private final String description;
}