Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-06 beeda8df0023376dbb2021148a021731dc4aedb0

 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);
    }

}