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

kaiyu

2021-09-14 82841afc4e140f72fdeb378102e0e9a978bbe14c

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

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

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

}