68be3ba4d1
# Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java # coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
Custom Zxjp
正新鸡排