Merge remote-tracking branch 'origin/master'

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java

@@ -84,6 +84,19 @@ public class ActSuppliesController extends BaseController
         return util.exportExcel(list, "用友物料");
     }
 
+    /**
+     * 导出物料总分类管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:exportOne')")
+    @Log(title = "物料总分类管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportOne")
+    public AjaxResult exportOne(ActSupplies actSupplies)
+    {
+        List<ActSupplies> list = actSuppliesService.selectActSuppliesListOne(actSupplies);
+        ExcelUtil<ActSupplies> util = new ExcelUtil<ActSupplies>(ActSupplies.class);
+        return util.exportExcel(list, "物料总分类管理数据");
+    }
+
     /**
      * 获取物料总分类管理详细信息
      */

ruoyi-ui/src/api/Actsupplies/Actsupplies.js

@@ -86,6 +86,14 @@ export function exportSupplies(query) {
   })
 }
 
+export function exportSuppliesOne(query) {
+    return request({
+        url: '/Actsupplies/Actsupplies/exportOne',
+        method: 'get',
+        params: query
+    })
+}
+