DeXun/double-rack
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ruoyi/master'

Browse Source 
# Conflicts:
#	README.md
#	ruoyi-ui/package.json
#	ruoyi-ui/src/assets/styles/index.scss
#	ruoyi-ui/src/utils/generator/js.js
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/vue.config.js
This commit is contained in:
tony
2023-07-12 08:53:31 +08:00
parent 5db00f34a0 a0595711ca
commit c92a2f1c15
38 changed files with 459 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ruoyi-ui/src/assets/images/pay.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 137 KiB

2
ruoyi-ui/src/assets/styles/sidebar.scss
View File

@@ -1,7 +1,7 @@
#app {
.main-container {
min-height: 100%;
height: 100%;
transition: margin-left .28s;
margin-left: $base-sidebar-width;
position: relative;