Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

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

@@ -86,5 +86,7 @@


    List<Device> getDeviceByCodeAndId(@Param("code") String code, @Param("id") String id);



    List<Map<String, Object>> getDevicesByMpId(int mpId);



    String byMacGetOrgId(String mac);

}