From 85037c73f8b16f4258a2af354cd162247700ffde Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Sun, 14 Jul 2024 18:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/java/com/nq/controller/backend/AdminStockController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/controller/backend/AdminStockController.java b/src/main/java/com/nq/controller/backend/AdminStockController.java
index 5c0d4eb..a884965 100644
--- a/src/main/java/com/nq/controller/backend/AdminStockController.java
+++ b/src/main/java/com/nq/controller/backend/AdminStockController.java
@@ -33,8 +33,16 @@
//查询产品管理 所以股票信息及模糊查询
@RequestMapping({"list.do"})
@ResponseBody
- public ServerResponse list(@RequestParam(value = "showState", required = false) Integer showState, @RequestParam(value = "lockState", required = false) Integer lockState, @RequestParam(value = "code", required = false) String code, @RequestParam(value = "name", required = false) String name, @RequestParam(value = "stockPlate", required = false) String stockPlate, @RequestParam(value = "stockType", required = false) String stockType, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize, HttpServletRequest request) {
- return this.iStockService.listByAdmin(showState, lockState, code, name, stockPlate, stockType, pageNum, pageSize, request);
+ public ServerResponse list(@RequestParam(value = "stockGid", required = false) String stockGid,
+ @RequestParam(value = "showState", required = false) Integer showState,
+ @RequestParam(value = "lockState", required = false) Integer lockState,
+ @RequestParam(value = "code", required = false) String code,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "stockPlate", required = false) String stockPlate,
+ @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
+ HttpServletRequest request) {
+ return this.iStockService.listByAdmin(stockGid,showState, lockState, code, name, stockPlate, null, pageNum, pageSize, request);
}
//修改产品管理 股票是否锁定
--
Gitblit v1.9.3