Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!899

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -521,7 +521,7 @@ public class UserTicketController extends BaseApiController {
         jsonObject.put("prizeList", ticketAwardsPrizes);
         jsonObject.put("ticketId", ticket.getTicketId());
         jsonObject.put("boxId", ticket.getBoxId());
-        jsonObject.put("type", ticketBox.getType());
+        jsonObject.put("type", ticketBox.getType().getValue());
         return AjaxResult.success(jsonObject);
     }