jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-23 23:09:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/router/index.js
This commit is contained in:
疯狂的狮子li
2020-09-11 09:17:43 +08:00
parent a41bc230a1 9c0ed9c424
commit 06c4d4d01b
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -18,7 +18,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<mybatis.boot.version>1.3.2</mybatis.boot.version>
<druid.version>1.1.23</druid.version>
<druid.version>1.1.22</druid.version>
<bitwalker.version>1.19</bitwalker.version>
<swagger.version>2.9.2</swagger.version>
<kaptcha.version>2.3.2</kaptcha.version>
@ -29,7 +29,7 @@
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<poi.version>3.17</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.0</jwt.version>
<jwt.version>0.9.1</jwt.version>
<mybatis-plus.version>3.3.0</mybatis-plus.version>
<hutool.version>5.1.0</hutool.version>
</properties>