Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-26 a1f7c11ab3753bd417def1879150c94abd0c06d5

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java

@@ -69,7 +69,7 @@
     * @param orderId
     * @return
     */
    OrderEvaluateVo getOrderEvaluate(Integer orderId, Integer orderType);
    OrderEvaluateVo getOrderEvaluate(String orderId, Integer orderType);

    List<Map<String, Object>> goodTop(List<Integer> siteIds);