Merge branch 'dev/feat/partner1.3_20230828' into hxd/feat/labelAndlLine

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-service/pom.xml
This commit is contained in:
xiaodong.hu
2023-08-14 15:10:31 +08:00
110 changed files with 4559 additions and 135 deletions

View File

@@ -85,6 +85,11 @@
<artifactId>dysmsapi20170525</artifactId>
<version>2.0.1</version>
</dependency>
<!--websocket作为服务端-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>com.alibaba</groupId>