Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-15 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b

 src/main/java/com/moral/mapper/DeviceMapper.java

@@ -95,5 +95,5 @@


    List<Device> getDeviceByCityCode();





    List<Device> getDevicesByAccountId(String id);

}