# Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java