From 83c4dd24f674b5f2c3d10ab98d04e8562202449b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 21:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 manage/src/main/java/com/jilongda/manage/model/TOrder.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/manage/src/main/java/com/jilongda/manage/model/TOrder.java b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
index 00e132a..284fe72 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrder.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
@@ -162,5 +162,11 @@
     @ApiModelProperty(value = "支付方式")
     @TableField("payTypeName")
     private String payTypeName;
+    @ApiModelProperty(value = "手续费扣除")
+    private BigDecimal commission;
+    @ApiModelProperty(value = "笨蛋毛利")
+    private BigDecimal profitMoney;
+    @ApiModelProperty(value = "毛利率")
+    private BigDecimal profitRating;
 
 }

--
Gitblit v1.7.1