xiaozhi/xiaozhi-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/tool/build/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
	ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
This commit is contained in:
疯狂的狮子li
2020-04-03 10:16:28 +08:00
parent 39d8723159 ec65b1f7ec
commit 31a2713012
14 changed files with 118 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-ui/src/views/tool/build/index.vue
+2 -3
View File
@@ -135,7 +135,6 @@
</div>
</template>
<script>
import draggable from 'vuedraggable'
import { saveAs } from 'file-saver'
@@ -429,7 +428,7 @@ input, textarea{
padding: 12px 18px 15px 15px;
}
}
.el-scrollbar__wrap {
.left-scrollbar .el-scrollbar__wrap {
box-sizing: border-box;
overflow-x: hidden !important;
margin-bottom: 0 !important;
@@ -503,7 +502,7 @@ input, textarea{
}
}
.el-scrollbar__view{
.left-scrollbar .el-scrollbar__view{
overflow-x: hidden;
}