Merge branch 'acid_push' into huacheng_test

zhaozhengjie

2022-09-16 f4c8664c2d1c6d6e62f75433a27c5645942d5e85

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java

@@ -27,7 +27,7 @@
     * @return 单条数据
     */
    @GetMapping("/comPropertyRepair/{id}")
    R comPropertyRepairSelectOne(@PathVariable("id") Integer id);
    R comPropertyRepairSelectOne(@PathVariable("id") Long id);

    /**
     * 新增数据