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/system/domain/dto/UserMerchantQueryCriteria.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/dto/UserMerchantQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/system/domain/dto/UserMerchantQueryCriteria.java
index 615e94d..54b961c 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/dto/UserMerchantQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/dto/UserMerchantQueryCriteria.java
@@ -21,7 +21,7 @@
@ApiModelProperty(value = "用户id")
private Long userId;
- @ApiModelProperty(value = "角色类型（OWNER、ADMIN、FINANCE、OPERATOR）")
+ @ApiModelProperty(value = "角色类型")
private String roleType;
private List<Timestamp> createTime;
}
--
Gitblit v1.9.3