!8 sync 同步ruoyi-vue-plus更新

fix -- 修复代码生成页面错误bug fix -- 调整返回类型为R，修正脚本
2022-01-30 15:34:26 +00:00
parent 47539482b4
commit a423f02fad
187 changed files with 2181 additions and 1821 deletions
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -47,9 +47,8 @@
 .mb10 {
  margin-bottom: 10px;
 }
-
-.ml0 {
-  margin-left: 10px;
+.ml10 {
+	margin-left: 10px;
 }

 .mt20 {
@@ -63,9 +62,8 @@
 .mb20 {
  margin-bottom: 20px;
 }
-
-.m20 {
-  margin-left: 20px;
+.ml20 {
+	margin-left: 20px;
 }

 .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {