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

gongchunyi

5 天以前 61fef835f616f70ca35e1f046cdda82d6b68bfdc

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

 src/main/java/com/ruoyi/stock/controller/StockInventoryController.java

@@ -69,14 +69,14 @@
    }

    @Log(title = "下载库存导入模板", businessType = BusinessType.EXPORT)
    @PostMapping("/exportStockInventory")
    public void exportStockInventory(HttpServletResponse response) {
    @PostMapping("/downloadStockInventory")
    public void downloadStockInventory(HttpServletResponse response) {
        List<StockInventoryExportData> list = new ArrayList<>();
        ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
        util.exportExcel(response, list, "库存模板");
    }

    @GetMapping("/exportStockInventory")
    @PostMapping("/exportStockInventory")
    @ApiOperation("导出库存")
    public void exportStockInventory(HttpServletResponse response,StockInventoryDto stockInventoryDto) {
         stockInventoryService.exportStockInventory(response,stockInventoryDto);

 src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java

@@ -29,6 +29,6 @@

    int updateSubtractStockInventory(@Param("ew") StockInventoryDto stockInventoryDto);

    List<StockInventoryExportData> listStockInventoryExportData(StockInventoryDto stockInventoryDto);
    List<StockInventoryExportData> listStockInventoryExportData(@Param("ew") StockInventoryDto stockInventoryDto);

}