Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-12-28 948ad860498cc6c482ee492611b3394f7e661741

 ruoyi-ui/package.json

@@ -1,6 +1,6 @@
{
  "name": "ruoyi-vue-plus",
  "version": "3.4.0",
  "version": "3.5.0",
  "description": "RuoYi-Vue-Plus后台管理系统",
  "author": "LionLi",
  "license": "MIT",