From 77fe3ee1270642e04f6c93aad0e63d2b13c78342 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 26 一月 2024 15:05:13 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java
index 1738ec6..a6b3961 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java
@@ -14,9 +14,9 @@
@Data
public class MerMemberTaskPageDto extends MerPageDto {
- @ApiModelProperty(name = "会员用户id")
+ @ApiModelProperty(value = "会员用户id")
private Long memberUserId;
- @ApiModelProperty(name = "今日",hidden = true)
+ @ApiModelProperty(value = "今日",hidden = true)
private String today;
}
--
Gitblit v1.7.1