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

peng

3 天以前 463add4ee035938f9622a6c981668620f097067d

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

@@ -9,7 +9,7 @@
    /**
     * 中奖状态
     */
    WIN("未中奖"),
    NOT_WIN("中奖");
    WIN("中奖"),
    NOT_WIN("未中奖");
    private final String description;
}