From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014

---
 flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index bc1ff98..4ae077e 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -235,7 +235,6 @@
     @GetMapping("/smartConsulting")
     public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
         return  iTransactionEventService.smartConsulting(keyWord);
-
     }
 
 

--
Gitblit v1.7.1