From a5ebb9545a1fdc78f6c1c285ce4f6c7a37b9e749 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 14:21:19 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmApi.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmApi.java
index f74e666..f7bdc7e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmApi.java
+++ b/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);
}
/**
--
Gitblit v1.7.1