shuo.wang 68be3ba4d1 Merge branch 'master' into cc_20250526_jingDong ...

# 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

2025-05-27 13:51:36 +08:00

..

src/main

Merge branch 'master' into cc_20250526_jingDong

2025-05-27 13:51:36 +08:00

Dockerfile

update

2024-03-12 17:28:40 +08:00

pom.xml

修改jar名称

2024-06-27 10:18:53 +08:00