diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java
index 2498e6d..5ead41e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java
@@ -119,7 +119,6 @@ public class ConsMsgConsumer {
             log.info("conwarning:{},stockNumber:{}",tbConsInfo.getConWarning(),tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs());
             if (N.egt(tbConsInfo.getConWarning(), tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs())) {
 
-
                     List<TbUserShopMsg> tbUserShopMsgs = tbUserShopMsgMapper.selectAllByShopId(tbConsInfo.getShopId());
                     if (Objects.nonNull(tbUserShopMsgs) && tbUserShopMsgs.size()>0) {
                         tbUserShopMsgs.parallelStream().forEach(tbUserShopMsg->{
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
index aed562d..c760ea8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
@@ -124,6 +124,7 @@ public class LoginService {
         accountMap.put("accountId", account.getId());
         accountMap.put("merchantName", account.getAccount());
         accountMap.put("loginName", tbPlussShopStaff.getAccount());
+        accountMap.put("loginAccount",tbPlussShopStaff.getName());
         accountMap.put("clientType", loginReq.getClientType());
         accountMap.put("shopId", account.getShopId());
         accountMap.put("staffId", tbPlussShopStaff.getId());
diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml
index b423482..b5de222 100644
--- a/src/main/resources/mapper/TbOrderInfoMapper.xml
+++ b/src/main/resources/mapper/TbOrderInfoMapper.xml
@@ -76,7 +76,8 @@
         toi.STATUS,
         toi.out_number AS outNumber,
         toi.table_name AS tableName,
-        toi.remark
+        toi.remark,
+        toi.master_id
 
 
         FROM