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

陶杰

2024-12-25 6f0cee21409ccd21a762fb3a3a46cec06f65b503

 src/main/java/com/mzl/flower/dto/request/payment/OrderSettlementQueryDTO.java

@@ -29,4 +29,7 @@
    @ApiModelProperty(hidden = true)
    private String userId;

    @ApiModelProperty(value = "结算对象名称")
    private String userName;

}