From ea772fcdef390ca8bdb6746a1504e5ca88037d00 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 27 Jun 2025 16:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java b/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
index 038e4da..d536ea1 100644
--- a/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
+++ b/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
@@ -93,15 +93,17 @@
@RequestParam(value = "pageSize", defaultValue = "12") int pageSize,
@RequestParam(value = "keyword", defaultValue = "") String keyword,
@RequestParam(value = "agentId", required = false) String agentId,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "status", required = false) Integer status,
HttpServletRequest request) {
- return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId, request);
+ return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId,name,status, request);
}
//申购信息-添加 修改
@RequestMapping({"saveStockSubscribe.do"})
@ResponseBody
- public ServerResponse saveStockSubscribe(UserStockSubscribe model, HttpServletRequest request) {
+ public ServerResponse saveStockSubscribe(UserStockSubscribe model, HttpServletRequest request) throws Exception {
return this.iUserStockSubscribeService.save(model, request);
}
--
Gitblit v1.9.3