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

liyong

6 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java

@@ -287,7 +287,7 @@
    }

    @ApiOperation("查询销售台账消耗物料信息")
    @GetMapping("/getSalesLedgerWithProducts")
    @GetMapping("/getSalesLedgerWithProductsLoss")
    public R getSalesLedgerWithProductsLoss(Long salesLedgerId) {
        return R.ok(salesLedgerService.getSalesLedgerWithProductsLoss(salesLedgerId));
    }