Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

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

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

    private Date createTime;

    private Date updateTime;

    private Boolean isDelete;

    private String description;
}