From f33bea4c400fbaaabec8ffde7a2b1e00d8cdc9bb Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期三, 28 九月 2022 13:22:29 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
index 14c65aa..204af82 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -420,7 +420,7 @@
 
         long min = diff / nm;
 
-        return (int)min;
+        return (int)hour;
     }
 
     /**

--
Gitblit v1.7.1