From b0b1e641a31a0494262187f97034807fc53515dd Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 28 Oct 2024 15:49:39 +0800
Subject: [PATCH] Merge branch 'gzdyh_test' into gzdyh_grid
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java
index fffea68..7f8acda 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java
@@ -1,6 +1,7 @@
package cn.huge.module.grid.controller.web;
import cn.huge.base.common.bo.R;
+import cn.huge.base.common.utils.AesUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
@@ -43,7 +44,7 @@
public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
try {
GridCompanyVo gridCompanyVo = new GridCompanyVo();
- String integratedQuery = request.getParameter("trueName");
+ String integratedQuery = request.getParameter("integratedQuery");
gridCompanyVo.setIntegratedQuery(integratedQuery);
gridCompanyVo.setPage(page);
gridCompanyVo.setPageSize(size);
--
Gitblit v1.8.0