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

疯狂的狮子Li

2021-09-20 5306a45093bd7549dcd864c58bebd8f53b5fe279

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


 Conflicts:

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java

 ruoyi-ui/src/views/monitor/job/index.vue

@@ -240,7 +240,7 @@
      </div>
    </el-dialog>

    <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body class="scrollbar">
    <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body class="scrollbar"  destroy-on-close >
      <crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
    </el-dialog>


 ruoyi-ui/src/views/tool/gen/index.vue

@@ -301,6 +301,7 @@
      previewTable(row.tableId).then(response => {
        this.preview.data = response.data;
        this.preview.open = true;
        this.preview.activeName = "domain.java";
      });
    },
    /** 高亮显示 */