Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

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

@@ -22,6 +22,7 @@
    public void setUid(Integer uid) {
        device.setOperateUserId(uid);
    }
    public void setId(Integer id) {  device.setId(id);  }

    public void setDevice_name(String device_name) {
        device.setName(device_name);