Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-01 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f

 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(){