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

liyong

2 天以前 80c45ea7934443bea5355bc6bace96ec23a58600

 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;