From cb2e79e8374725da81b19c518405f1b91c86e601 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 07 四月 2022 14:27:54 +0800
Subject: [PATCH] Merge branch 'master' of D:\workspace\ztqt with conflicts.
---
src/views/systemManage/userManage/index.vue | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/views/systemManage/userManage/index.vue b/src/views/systemManage/userManage/index.vue
index 8d50985..3d292cc 100644
--- a/src/views/systemManage/userManage/index.vue
+++ b/src/views/systemManage/userManage/index.vue
@@ -747,6 +747,7 @@
params['pageIndex'] = _this.currentPage
params['pageSize'] = _this.pageSize
params['type'] = _this.userType
+ params['isMain'] = true
for (const i in _this.queryForm) {
if (_this.queryForm[i] != undefined && _this.queryForm[i].toString() != '') {
params[i] = _this.queryForm[i]
--
Gitblit v1.9.2