Merge remote-tracking branch 'origin/test' into test

101captain

2021-10-08 b4d50f4592010df944515aecb37884cb8e3e55a0

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java

@@ -43,7 +43,7 @@
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Integer id) {
        return R.ok(this.comPropertyRepairService.getById(id));
        return this.comPropertyRepairService.selectDetail(id);
    }

    /**