Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

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