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

zss

昨天 599b5ff692722226d1e30fbdffc594b826bfa815

 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;