From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
index 80d1fae..2c46c6d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
@@ -21,13 +21,29 @@
     R comPropertyRepairSelectAll(@RequestBody CommonPage commonPage);
 
     /**
+     * 分页查询所有数据 脱敏
+     * @return 所有数据
+     */
+    @PostMapping("/comPropertyRepair/queryAllDesensitize")
+    R comPropertyRepairSelectAllDesensitize(@RequestBody CommonPage commonPage);
+
+    /**
      * 通过主键查询单条数据
      *
      * @param id 主键
      * @return 单条数据
      */
     @GetMapping("/comPropertyRepair/{id}")
-    R comPropertyRepairSelectOne(@PathVariable("id") Integer id);
+    R comPropertyRepairSelectOne(@PathVariable("id") Long id);
+
+    /**
+     * 通过主键查询单条数据 脱敏
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/comPropertyRepair/desensitize/{id}")
+    R comPropertyRepairSelectOneDesensitize(@PathVariable("id") Long id);
 
     /**
      * 新增数据

--
Gitblit v1.7.1