From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyTaskPageDto.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyTaskPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyTaskPageDto.java
index 13e0220..0f2b656 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyTaskPageDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyTaskPageDto.java
@@ -16,12 +16,12 @@
@Data
public class MerAgencyTaskPageDto extends MerPageDto {
- @ApiModelProperty(name = "代理商id")
+ @ApiModelProperty(value = "代理商id")
private Long agencyId;
- @ApiModelProperty(name = "任务状态0未开始1待处理2已处理3已过期")
+ @ApiModelProperty(value = "任务状态0未开始1待处理2已处理3已过期")
private Integer taskStatus;
- @ApiModelProperty(name = "现在日期",hidden = true)
+ @ApiModelProperty(value = "现在日期",hidden = true)
private String nowDay;
}
--
Gitblit v1.7.1