update

2021-09-25 19:26:29 +08:00 · 2021-09-25 19:26:29 +08:00 · 70a25e2a67
commit 70a25e2a67
parent f83d147481
1 changed files with 0 additions and 4 deletions
--- a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
@ -214,12 +214,8 @@ export default {
  display: inline-block;
 }
 .tree {
-<<<<<<< HEAD
  overflow:auto;
  height: calc(100% - 52px);
-=======
-  overflow: auto;
  max-height: 600px;
->>>>>>> master
 }
 </style>