From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java
index cae5522..ba2fa51 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java
@@ -29,7 +29,7 @@
@TableField("objectId")
private Integer objectId;
/**
- * 收入类型（1=活动，2=业务）
+ * 收入类型（1=活动收入，2=跑单收入，3=取消订单收入，4=改派订单收入，5=优惠券补贴，6=折扣不贴，7=红包补贴）
*/
@TableField("type")
private Integer type;
--
Gitblit v1.7.1