You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
疯狂的狮子li e80349c343 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/utils/request.js
4 years ago
..
src/main/java/com/ruoyi/common Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 4 years ago
pom.xml Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 4 years ago