Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -1130,4 +1130,9 @@
        return deviceMapper.getDeviceByCityCode();
    }

    @Override
    public List<Device> getDevicesByAccountId(String id) {
        return deviceMapper.getDevicesByAccountId(id);
    }

}