Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

# Conflicts:
#	coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java
This commit is contained in:
zhangchenbiao
2023-06-16 11:20:08 +08:00
68 changed files with 1245 additions and 211 deletions

View File

@@ -41,6 +41,11 @@
<groupId>com.aliyun</groupId>
<artifactId>ons20190214</artifactId>
</dependency>
<!-- OSS -->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>