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

lizijie

2021-09-16 86c06b0f6f30099b436814ab223121aa8239081a

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

@@ -35,7 +35,4 @@
    //获取半年内有数据的走航日期
    List<String> getDatesByMac(String mac);

    //获取半年内有数据的走航日期
    List<String> getDatesByMac(String mac);

}