From 2b72e2b592f642b23e5c78a3ffdab3fc1fafba11 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 09 十月 2021 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 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