Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-30 852ec1d729b61077d8131591a5349c7e4a1bed79

 src/main/java/com/mzl/flower/dto/request/coupon/QueryActivePointCouponDTO.java

@@ -7,7 +7,7 @@
@Data
public class QueryActivePointCouponDTO{

    @ApiModelProperty(value = "排序列 point desc / create_time desc,默认 create_time desc")
    @ApiModelProperty(value = "排序列 point desc / create_time desc,默认 create_time desc",hidden = true)
    private String orderStr;

    @ApiModelProperty(value = "积分最小值")