记得上下班打卡 | git大法好,push需谨慎

Commit 61d8817c authored by 胡佳晨's avatar 胡佳晨

Merge branch 'dev' into test

parents 7fd0a36e bea198a7
...@@ -347,7 +347,11 @@ public class DataImpl { ...@@ -347,7 +347,11 @@ public class DataImpl {
ticketStatus.setStatus(ticketData.getInt("status")); ticketStatus.setStatus(ticketData.getInt("status"));
ticketStatus.setCounts(1); ticketStatus.setCounts(1);
ticketStatus.setStatusExchange(7); ticketStatus.setStatusExchange(7);
if (performancePartnerVo.getType().equals(101)) {
ticketStatus.setIsShowCode(1); ticketStatus.setIsShowCode(1);
} else {
ticketStatus.setIsShowCode(0);
}
ticketStatus.setQrCodeShowTime(tickets.getCreatedAt()); ticketStatus.setQrCodeShowTime(tickets.getCreatedAt());
ticketStatus.setIsLackRegister(ticketData.getInt("is_lack_register")); ticketStatus.setIsLackRegister(ticketData.getInt("is_lack_register"));
ticketStatus.setTotalGeneral(ticketData.getInt("total_general")); ticketStatus.setTotalGeneral(ticketData.getInt("total_general"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment