Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension

 Conflicts:
	更新日志.md
This commit is contained in:
YunaiV
2021-10-27 12:32:57 +08:00
35 changed files with 543 additions and 126 deletions

View File

@ -14,7 +14,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties>
<revision>1.1.0-snapshot</revision>
<revision>1.2.0-snapshot</revision>
<!-- 统一依赖管理 -->
<spring.boot.version>2.4.5</spring.boot.version>
<!-- Web 相关 -->