From ea26c842829ef69be20ef86d6a546f45c6c5a258 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 04 Sep 2025 15:31:57 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/domain/RiderIncomeDetail.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderIncomeDetail.java b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderIncomeDetail.java
index a3fd5e5..16f1a54 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderIncomeDetail.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderIncomeDetail.java
@@ -48,10 +48,10 @@
@ApiModelProperty(value = "收入类型：1-配送费，2-奖励，3-补贴")
private String incomeType;
- @ApiModelProperty(value = "收入日期(YYYY-MM-dd)方便统计")
+ @ApiModelProperty(value = "收入日期(YYYYMMdd)方便统计")
private String incomeDate;
- @ApiModelProperty(value = "收入月份YYYY-MM")
+ @ApiModelProperty(value = "收入月份YYYYMM")
private String incomeMonth;
@ApiModelProperty(value = "订单状态：1-待取货，2-配送中，3-已完成，4-已取消")
--
Gitblit v1.9.3