Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-25 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtMemberOrderPageDto.java

@@ -15,7 +15,7 @@
public class MgtMemberOrderPageDto extends MgtPageDto {

    @ApiModelProperty(value = "用户id")
    private Long userId;
    private Long memberUserId;

    @ApiModelProperty(value = "搜索关键词")
    private String keyword;