From a5e69c038c7c72239e8077d4373eeb88b7ac1248 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 14 七月 2022 14:12:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index d6993b1..2822357 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3481,7 +3481,6 @@
         return R.ok(userRate);
     }
 
-
     @Override
     public R realUser(Integer type, Long streetId, Long areaCode, Integer range) {
         IndexDataAnalysisVO analysisVO=new IndexDataAnalysisVO();
@@ -3602,7 +3601,6 @@
         }
         return R.ok();
     }
-
     @Override
     public R getAreaAndStreet() {
         List<Integer> areaCodeList=areaCodeList();
@@ -3617,6 +3615,7 @@
         return R.ok(areaVOList);
     }
 
+
     /**
      * 获取最近20天数据
      *

--
Gitblit v1.7.1