From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderOperationLogQueryCriteria.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderOperationLogQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderOperationLogQueryCriteria.java
index d0b8f3e..26b92d1 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderOperationLogQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderOperationLogQueryCriteria.java
@@ -18,13 +18,13 @@
@ApiModelProperty(value = "每页数据量", example = "10")
private Integer size = 10;
- @ApiModelProperty(value = "用户id")
- private Long userId;
+ @ApiModelProperty(value = "用户账号")
+ private String username;
@ApiModelProperty(value = "用户类型")
private String userType;
@ApiModelProperty(value = "订单号")
- private Long orderNum;
+ private String orderNum;
private List<Timestamp> operationTime;
}
--
Gitblit v1.9.3