Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

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

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

    private Date createTime;

    private Date updateTime;

    private Boolean isDelete;

    private String description;
}