Merge branch 'cjl' into dev

cjl

2023-08-26 6d4ee331b8fa5fc65a7a875a54b32118e9cd903f

 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);
}