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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

 screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java

@@ -7,6 +7,7 @@
import com.moral.api.entity.Device;
import com.moral.api.entity.HistoryDaily;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.entity.HistoryMinutely;

/**
 * <p>