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/AdminStockSubscribeController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java b/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
index cb145a3..bfc9700 100644
--- a/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
+++ b/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
@@ -42,8 +42,9 @@
@RequestParam(value = "zt", required = false) Integer zt,
@RequestParam(value = "isLock", required = false) Integer isLock,
@RequestParam(value = "type", required = false) Integer type,
+ @RequestParam(value = "stockType", required = false) Integer stockType,
HttpServletRequest request) {
- return this.iStockSubscribeService.list(name,code,zt,0,isLock,type,request);
+ return this.iStockSubscribeService.list(name,code,zt,0,isLock,type,stockType,1,request);
}
/**
* @Description: 新增新股
--
Gitblit v1.9.3