From b967bac24b2fd662ac3b8826700fb76c26690aec Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Tue, 02 Dec 2025 00:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
index 76a2f62..7d91b82 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
@@ -42,10 +42,10 @@
@RequestParam(value = "startTime") String startTime,
@RequestParam(value = "endTime") String endTime,
@RequestParam(value = "discount", required = false) String discount,
- @RequestParam(value = "period") Integer period,
+ @RequestParam(value = "period", required = false) Integer period,
@RequestParam(value = "nowPrice") String nowPrice,
@RequestParam(value = "switchType", defaultValue = "0") Integer switchType) {
- return stockDzService.addByAdmin(stockCode, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType);
+ return stockDzService.addByAdmin(stockCode, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.indices);
}
/**
@@ -74,7 +74,7 @@
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices);
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices, null);
}
@ApiOperation("大宗审核")
@@ -86,7 +86,7 @@
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
- return stockDzService.dzCheck(id, checkType, orderNum);
+ return stockDzService.dzCheck(id, checkType, orderNum, 0);
}
}
--
Gitblit v1.9.3