Merge branch 'local_20221115' into local_20221104

yanghui

2022-11-15 70e7fd0ab091b64a4fa5c13fcb77bc7471ea3833

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

@@ -64,7 +64,7 @@
        ComPropertyAlarm comPropertyAlarm=new ComPropertyAlarm();
        BeanUtils.copyProperties(comPropertyAlarmVO,comPropertyAlarm);
        comPropertyAlarm.setCreateTime(DateUtil.date());
        return R.ok(this.comPropertyAlarmService.insert(comPropertyAlarm));
        return this.comPropertyAlarmService.insert(comPropertyAlarm);
    }

    /**