Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

6 天以前 41b6d0c9c00b24534a90bbd4cdeb0537cb889c67

 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java

@@ -17,7 +17,6 @@

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;