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

cloudroam

2024-10-12 d390d8f502436eaa17ee8ca7abd3c3f8a11a8514

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

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

    @ApiModelProperty(value = "支付单号")
    private String paymentTrId;

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

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