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

gongzuming

2024-09-10 9767770dfabddd7ebc57c8d323af566b9655fa3e

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