Ry-master

Commit Graph

Author	SHA1	Message	Date
疯狂的狮子li	fd5414f82e	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java ruoyi-ui/src/components/ImageUpload/index.vue ruoyi-ui/src/views/login.vue sql/ry_20210713.sql	2021-07-13 13:34:10 +08:00
RuoYi	7b894da43c	参数管理支持配置验证码开关	2021-07-13 10:30:40 +08:00

Author

SHA1

Message

Date

疯狂的狮子li

fd5414f82e

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

 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/login.vue
	sql/ry_20210713.sql

2021-07-13 13:34:10 +08:00

RuoYi

7b894da43c

参数管理支持配置验证码开关

2021-07-13 10:30:40 +08:00

2 Commits