Merge branches '2.0' and '2.0' of http://120.76.84.145:10101/gitblit/r/java...

huliguo

6 天以前 7a74745bad7ff20df9e170433c1e1cb851ce7fa9

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -4976,7 +4976,7 @@
            orderFromList.add(meituan);
            orderFromList = bigListRemoveNull(orderFromList);

            //

            //排行
            List<MgtMapBigTotalVo> sortedList = orderFromList.stream()
                    // 按 mapValue 降序排序，处理 null 值（若 mapValue 可能为 null）