From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge
---
src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java b/src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java
index f64835b..f73c782 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java
@@ -42,8 +42,8 @@
})
@GetMapping(value = "/findBlockAddress")
@SubmitRepeat
- public Result findBlockAddress(String symbol) {
- return blockSerive.findBlockAddress(symbol);
+ public Result findBlockAddress(String symbol, String lable) {
+ return blockSerive.findBlockAddress(symbol, lable);
}
}
--
Gitblit v1.9.1