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

fengxiang

2017-12-22 01329695ebf6eea6576d76825181b2f3833297e8

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

# Conflicts:
#	src/main/java/com/moral/common/bean/PageBean.java

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

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

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


public class DeviceVersion {
    @Id
    private Integer id;

    private String name;