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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

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