Merge branch 'huacheng' into huacheng_dev

101captain

2022-04-12 a59b11c1d68c1d5311edeef0d764798ad4b5182c

 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);
    }

    /**