Merge remote-tracking branch 'origin/lyq_battery_shop' into diandongche

101captain

2022-08-15 bfbfe7d5fd6c90d5f7359762223ce4bd1cc7cfa1

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

@@ -42,8 +42,8 @@
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Integer id) {
        return R.ok(this.comPropertyRepairService.getById(id));
    public R selectOne(@PathVariable("id") Long id) {
        return this.comPropertyRepairService.selectDetail(id);
    }

    /**