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

@@ -5,14 +5,14 @@
<parent>
<artifactId>yudao</artifactId>
<groupId>cn.iocoder.boot</groupId>
<version>1.1.0-snapshot</version>
<version>1.2.0-snapshot</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>yudao-core-service</artifactId>
<packaging>jar</packaging>
<name>yudao-admin-server</name>
<name>yudao-core-service</name>
<description>
公共服务,通过 jar 包的方式,被 yudao-admin-server、yudao-user-service 使用。例如说:
1. 日志相关:访问日志、登录日志、异常日志等等