Merge remote-tracking branch 'origin/master'

liujie

2023-05-26 2e3407d0b46a6e2e75f8cf14cce73f8e0ba2051e

 src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java

@@ -469,10 +469,12 @@
            Integer groupId = tUser.getGroupId();
            if(groupId!=null) {
                TGroup tGroup = tGroupMapper.selectById(groupId);
                orderInfo.setSalesGroup(tGroup.getName());
                Integer salesId = tGroup.getSalesId();
                User user = userMapper.selectById(salesId);
                orderInfo.setSales(user.getName());
                if(tGroup!=null) {
                    orderInfo.setSalesGroup(tGroup.getName());
                    Integer salesId = tGroup.getSalesId();
                    User user = userMapper.selectById(salesId);
                    orderInfo.setSales(user.getName());
                }
            }
            // 获取码头id  获取码头地址  pickup信息
            Integer portId = tOrder.getPort();