From f86434155580a034e041dd53b6aad5bf0a4dcd6b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 28 九月 2021 17:24:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
index 9a8c8b5..0c4c4c4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -365,7 +365,6 @@
      */
     @PostMapping("/merchant/add")
     public R addMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO) {
-        log.error("catTimeStamp进入service_community", Instant.now().toEpochMilli());
         return convenientMerchantService.addMerchant(convenientMerchantDTO);
     }
 

--
Gitblit v1.7.1