Merge remote-tracking branch 'remote-v2/master-v2' into master-v2

xuxueyang

2024-09-24 272188e47087a8ef92eb0a48b122fa1c73ea94d3

 src/main/java/com/mzl/flower/mapper/point/CustomerPointDetailMapper.java

@@ -19,5 +19,5 @@

    List<CustomerPointDetailVO> queryPage(@Param("dto") CustomerPointDetailQueryDTO dto, Page page);

    List<ExpiredPointDTO> tongjiExpiredPoint(@Param("lastYear") LocalDate lastYear);
    List<ExpiredPointDTO> tongjiExpiredPoint(@Param("lastYear") LocalDate lastYear,@Param("userId") String userId);
}