# Conflicts: # src/main/java/com/yaoyaozw/customer/components/CustomerServiceCommonAsyncComponent.java # src/main/java/com/yaoyaozw/customer/entity/CustomerGraphicsDelay.java # src/main/resources/mapper/KanbanCommonMapper.xml
