ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ruoyi-cloud/master' 

# Conflicts:
#	README.md
#	pom.xml
#	ruoyi-api/pom.xml
#	ruoyi-api/ruoyi-api-system/pom.xml
#	ruoyi-auth/pom.xml
#	ruoyi-common/pom.xml
#	ruoyi-common/ruoyi-common-core/pom.xml
#	ruoyi-common/ruoyi-common-datascope/pom.xml
#	ruoyi-common/ruoyi-common-datasource/pom.xml
#	ruoyi-common/ruoyi-common-log/pom.xml
#	ruoyi-common/ruoyi-common-redis/pom.xml
#	ruoyi-common/ruoyi-common-security/pom.xml
#	ruoyi-common/ruoyi-common-swagger/pom.xml
#	ruoyi-gateway/pom.xml
#	ruoyi-modules/pom.xml
#	ruoyi-modules/ruoyi-file/pom.xml
#	ruoyi-modules/ruoyi-gen/pom.xml
#	ruoyi-modules/ruoyi-job/pom.xml
#	ruoyi-modules/ruoyi-system/pom.xml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-visual/pom.xml
#	ruoyi-visual/ruoyi-monitor/pom.xml
2.X
疯狂的狮子li 2022-01-24 13:07:55 +08:00
parent d70b51b09a bd30f3d53a
commit c790e65937
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -20,8 +20,8 @@
<spring-boot.version>2.6.3</spring-boot.version>
<spring-cloud.version>2021.0.0</spring-cloud.version>
<spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
<alibaba.nacos.version>2.0.3</alibaba.nacos.version>
<spring-boot-admin.version>2.6.1</spring-boot-admin.version>
<alibaba.nacos.version>2.0.4</alibaba.nacos.version>
<spring-boot-admin.version>2.6.2</spring-boot-admin.version>
<spring-boot.mybatis>2.2.0</spring-boot.mybatis>
<swagger.core.version>1.6.2</swagger.core.version>
<tobato.version>1.27.2</tobato.version>

4
ruoyi-ui/src/assets/styles/ruoyi.scss
View File

@ -37,7 +37,7 @@
.mb10 {
margin-bottom: 10px;
}
.ml0 {
.ml10 {
margin-left: 10px;
}
.mt20 {
@ -49,7 +49,7 @@
.mb20 {
margin-bottom: 20px;
}
.m20 {
.ml20 {
margin-left: 20px;
}