From 2f38b2341e1572502fd6b4510670107f57ed261c Mon Sep 17 00:00:00 2001 From: jiangqs <343695869@qq.com> Date: 星期五, 18 八月 2023 23:05:34 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java index 6003f99..6f6333e 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java @@ -73,4 +73,5 @@ MerOrderFromRankVo orderTotalVo = orderService.getMerOrderFromRank(merTotalDto); return R.ok(orderTotalVo); } + } -- Gitblit v1.7.1