Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-01-05 930adc902c0d0a81b685e7d3f0443df50cb608a0

 src/main/java/com/moral/controller/DeviceVersionController.java

@@ -6,7 +6,6 @@
import com.moral.entity.DeviceVersion;
import com.moral.service.DeviceVersionService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;