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

liyong

20 小时以前 2cc19f8033348f34df382d27f63810b2d6f56a05

 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;