Merge remote-tracking branch 'origin/master'

fengxiang

2018-01-26 e125b445697a6b8c2b5cc5c57f31249c5088c1c9

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

@@ -1,8 +1,10 @@
package com.moral.entity;

import javax.persistence.Id;
import java.util.Date;

public class DeviceVersion {
    @Id
    private Integer id;

    private String name;