Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-01 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f

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

@@ -3,7 +3,6 @@
import javax.persistence.Id;
import java.util.Date;


public class DeviceVersion {
    @Id
    private Integer id;