Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-06 9b02f67b17b9dcbd798862021ac0a516d1ba69b3

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

@@ -824,5 +824,10 @@
        return monitorPointMapper.byIdGetMonitorPoint(id);

    }



    @Override

    public String getOrgIdByMac(String mac) {

        return monitorPointMapper.getOrgIdByMac(mac);

    }





}