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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

 src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java

@@ -85,4 +85,12 @@

    @ApiModelProperty(value = "快递单号")
    private String deliveryNo;//快递单号

    @ApiModelProperty(value = "特殊需求")
    @DictTrans(target = "specialNeedsStr", codeType = "SPEC_REQ")
    private String specialNeeds;
    private String specialNeedsStr;

    @ApiModelProperty(value = "留言")
    private String remarks;
}