Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-06 9b02f67b17b9dcbd798862021ac0a516d1ba69b3

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

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

    private Date createTime;

    private Date updateTime;

    private Boolean isDelete;

    private String description;
}