a9f4a4e111
Conflicts: .gitignore ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml ruoyi-ui/src/utils/request.js ruoyi-ui/src/utils/ruoyi.js
45 lines
629 B
Plaintext
45 lines
629 B
Plaintext
######################################################################
|
|
# Build Tools
|
|
|
|
.gradle
|
|
/build/
|
|
!gradle/wrapper/gradle-wrapper.jar
|
|
|
|
target/
|
|
!.mvn/wrapper/maven-wrapper.jar
|
|
|
|
######################################################################
|
|
# IDE
|
|
|
|
### STS ###
|
|
.apt_generated
|
|
.classpath
|
|
.factorypath
|
|
.project
|
|
.settings
|
|
.springBeans
|
|
|
|
### IntelliJ IDEA ###
|
|
.idea
|
|
*.iws
|
|
*.iml
|
|
*.ipr
|
|
|
|
### NetBeans ###
|
|
nbproject/private/
|
|
build/*
|
|
nbbuild/
|
|
dist/
|
|
nbdist/
|
|
.nb-gradle/
|
|
|
|
######################################################################
|
|
# Others
|
|
*.log
|
|
*.xml.versionsBackup
|
|
*.swp
|
|
|
|
!*/build/*.java
|
|
!*/build/*.html
|
|
!*/build/*.xml
|