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

zxl

6 天以前 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec

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