Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-02 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3

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