Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-06 3367a9f350ca56ab0ea26011530210f5858c7792

 src/main/java/com/mzl/flower/service/flower/FlowerService.java

@@ -498,7 +498,7 @@
        Member member = getMember(levelId);

        BigDecimal price = getFinalPrice(pId, dto.getCategory()
                , s.getId(), dto.getPrice(), dto.getLevel());
                , dto.getId(), dto.getPrice(), dto.getLevel());
        dto.setPrice(price);
        dto.setPriceMember(calculateMemberPrice(price, member));