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

奖品选择增加boxId

See merge request quanshu/mp-server!317

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

@@ -200,6 +200,7 @@ public class UserTicketController extends BaseApiController {
     JSONObject jsonObject = new JSONObject();
     jsonObject.put("prizeList", ticketAwardsPrizes);
     jsonObject.put("ticketId", ticket.getTicketId());
+    jsonObject.put("boxId", ticket.getBoxId());
     return AjaxResult.success(jsonObject);
   }