Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 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;