code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict origin/master

Browse Source
This commit is contained in:
paulGao
2022-02-09 16:52:28 +08:00
parent bbe3399c90 a4ee4df71b
commit 4dc183cdf5
6 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -31,6 +31,10 @@
<jasypt-version>3.0.4</jasypt-version>
<neetl-version>2.9.10</neetl-version>
<lombok-version>1.18.22</lombok-version>
<redisson>3.5.5</redisson>
<aliyun-version>4.5.18</aliyun-version>
<aliyun-sdk-oss-version>3.11.1</aliyun-sdk-oss-version>
<aliyun-sdk-dysms-version>2.0.8</aliyun-sdk-dysms-version>
<aliyun-version>4.6.0</aliyun-version>
<aliyun-sdk-oss-version>3.14.0</aliyun-sdk-oss-version>
<aliyun-sdk-dysms-version>2.0.9</aliyun-sdk-dysms-version>