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

@@ -12,7 +12,7 @@
<artifactId>yudao-user-server</artifactId>
<packaging>jar</packaging>
<name>yudao-admin-server</name>
<name>yudao-user-server</name>
<description>用户前台 Server提供其 API 接口</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>