From c386b102a2397d569131e3a459465ba84e2376be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 21 Aug 2023 14:27:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index f49fa12..d77376b 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -295,7 +295,7 @@
}
middleDate = DateUtils.addDays(middleDate,1);
}
- } else if ("monthly".equals(type)){
+ } else if ("month".equals(type)){
end = DateUtils.getDateAddMonth(endTime, 1);
timeUnits = "monthly";
dateFormat = "%Y-%m";
--
Gitblit v1.8.0