Merge branch 'huacheng_tianfu' into huacheng_test

张天森

2022-09-27 7a689b0b79b080d279109905eb4b2a5bc3c2b72f

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

    /**