Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

 src/main/java/com/moral/entity/DeviceVersion.java

@@ -16,5 +16,9 @@

    private Date createTime;

    private Date updateTime;

    private Boolean isDelete;

    private String description;
}