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

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

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