jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
This commit is contained in:
疯狂的狮子li
2021-09-02 10:49:56 +08:00
parent b461c8cc99 ee823b8326
commit 1a695159e3
15 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/api/login.js
View File

@ -48,6 +48,6 @@ export function getCodeImg() {
return request({
url: '/captchaImage',
method: 'get',
timeout: 20000
timeout: 20000
})
}

1
ruoyi-ui/src/views/monitor/job/index.vue
View File

@ -320,6 +320,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
jobName: undefined,
jobGroup: undefined,
status: undefined

1
ruoyi-ui/src/views/monitor/job/log.vue
View File

@ -220,6 +220,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
jobName: undefined,
jobGroup: undefined,
status: undefined

1
ruoyi-ui/src/views/monitor/logininfor/index.vue
View File

@ -153,6 +153,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
ipaddr: undefined,
userName: undefined,
status: undefined

1
ruoyi-ui/src/views/system/config/index.vue
View File

@ -219,6 +219,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
configName: undefined,
configKey: undefined,
configType: undefined

1
ruoyi-ui/src/views/system/dict/data.vue
View File

@ -247,6 +247,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
dictName: undefined,
dictType: undefined,
status: undefined

1
ruoyi-ui/src/views/system/dict/index.vue
View File

@ -227,6 +227,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
dictName: undefined,
dictType: undefined,
status: undefined

1
ruoyi-ui/src/views/system/notice/index.vue
View File

@ -204,6 +204,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
noticeTitle: undefined,
createBy: undefined,
status: undefined

1
ruoyi-ui/src/views/system/post/index.vue
View File

@ -192,6 +192,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
postCode: undefined,
postName: undefined,
status: undefined

1
ruoyi-ui/src/views/system/role/authUser.vue
View File

@ -128,6 +128,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
roleId: undefined,
userName: undefined,
phonenumber: undefined

1
ruoyi-ui/src/views/system/role/index.vue
View File

@ -328,6 +328,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
roleName: undefined,
roleKey: undefined,
status: undefined

1
ruoyi-ui/src/views/system/user/index.vue
View File

@ -418,6 +418,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
userName: undefined,
phonenumber: undefined,
status: undefined,

1
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -219,6 +219,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
reasonable: true,
tableName: undefined,
tableComment: undefined
},