From 70e7fd0ab091b64a4fa5c13fcb77bc7471ea3833 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 15 十一月 2022 14:33:53 +0800
Subject: [PATCH] Merge branch 'local_20221115' into local_20221104

---
 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
index 44cae34..53aaaa8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
@@ -9,13 +9,14 @@
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
 import com.panzhihua.common.utlis.RSAUtils;
-import com.panzhihua.service_property.dao.ComPropertyRepairDao;
 import com.panzhihua.service_property.entity.ComPropertyRepair;
+import com.panzhihua.service_property.dao.ComPropertyRepairDao;
 import com.panzhihua.service_property.service.ComPropertyRepairService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * (ComPropertyRepair)表服务实现类
@@ -51,13 +52,6 @@
         }
         return R.ok(list);
     }
-
-    @Override
-    public R selectDetail(Long id) {
-        ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
-        return R.ok(vo);
-    }
-
     @Override
     public R selectDetailDesensitize(Long id) {
         ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
@@ -66,4 +60,12 @@
         vo.setFeedback(DesensitizedUtil.chineseName(vo.getFeedback()));
         return R.ok(vo);
     }
+
+    @Override
+    public R selectDetail(Long id) {
+        ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
+        return R.ok(vo);
+    }
+
+
 }

--
Gitblit v1.7.1