Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.

sxq

2021-06-11 56eba9cded865648465bc2c5815d47441e0457b1

 ruoyi-ui/src/components/RuoYi/Git/index.vue

@@ -18,4 +18,4 @@
    }
  }
}
</script>
</script>