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

导出幸运数字不区分环境

See merge request quanshu/mp-server!1057

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

@@ -421,10 +421,10 @@ public class TicketBoxMgrController extends BaseApiController {
                     } else {
                         ticketExcel.setUrl(exportUrl + ticket.getSerialNo());
                     }
-                    if (!ServerEnvEnum.PROD.getCode().equals(env)) {
+//                    if (!ServerEnvEnum.PROD.getCode().equals(env)) {
                         ticketExcel.setDrawNum(formatDraw(ticket.getDrawNum()));
                         ticketExcel.setCipherLuckyNum(RSAUtil.decrypt(ticket.getCipherLuckyNum()));
-                    }
+//                    }
                     excelList.add(ticketExcel);
                 }
             }