Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-02-27 df65f525e22b3c8c54083fb3c25c81c21c1b00f3

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TSettlementConfirmMapper.java

@@ -28,4 +28,6 @@


    List<TSettlementConfirm> settlementList(@Param("pageInfo") PageInfo<TSettlementConfirm> pageInfo, @Param("req") SettlementListQuery dto);

    List<TSettlementConfirm> settlementTotal(@Param("time") String time,@Param("siteIds")List<Integer> siteIds);
}