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

cjl

2023-11-15 f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a

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

@@ -16,4 +16,7 @@
public interface SysTestService extends IService<SysTest> {

    List<SysTest> listAll(String startTime,String endTime ,String mac);


    List<SysTest> listAllAvg(String startTime,String endTime ,String mac);
}