Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-24 153b891aea3fab7528d497e2ededf294fa016c3a

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

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


@Data
public class DeviceVersion {
    @Id