Merge branch 'master' into dev

# Conflicts:
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -678,8 +678,14 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                         //业绩归属公司
                         order.setSalesmanId(0L);
                     }
+                }
+
+
+
+
+
+            }//end
 
-                }//end
             // 更新所属客户经理(业务员)
             if (!OrderStatusEnum.DRAFT.getValue().equals(order.getStatus()) && Objects.nonNull(order.getCustomerId()) && order.getCustomerId() > 0) {
                 //addOrderCustomerService(order, customerType);