Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-29 2ac80d588a68f60084d8bcc02aabd18c91100267

 src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java

@@ -47,7 +47,7 @@
        device.setMonitorPointId(monitorpoint);
    }

    public void setProfessionId(String professionId) {
    public void setProfessionId(Integer professionId) {
        device.setProfessionId(professionId);
    }
    public Device toDevice(){