From 930adc902c0d0a81b685e7d3f0443df50cb608a0 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 05 Jan 2018 15:52:02 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

---
 src/main/java/com/moral/controller/DeviceVersionController.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/controller/DeviceVersionController.java b/src/main/java/com/moral/controller/DeviceVersionController.java
index a6b9fbe..82bcd73 100644
--- a/src/main/java/com/moral/controller/DeviceVersionController.java
+++ b/src/main/java/com/moral/controller/DeviceVersionController.java
@@ -2,12 +2,10 @@
 
 
 import com.moral.common.bean.PageBean;
-import com.moral.common.bean.PageResult;
 import com.moral.common.bean.ResultBean;
 import com.moral.entity.DeviceVersion;
 import com.moral.service.DeviceVersionService;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import java.io.UnsupportedEncodingException;
 

--
Gitblit v1.8.0