From c9b82feb62c72d7f19ad2716211137cc2db6b701 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 13:19:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

---
 manage/src/main/java/com/jilongda/manage/model/TOrder.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 284fe72..2be141a 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrder.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
@@ -163,10 +163,15 @@
     @TableField("payTypeName")
     private String payTypeName;
     @ApiModelProperty(value = "手续费扣除")
+    @TableField("commission")
     private BigDecimal commission;
     @ApiModelProperty(value = "笨蛋毛利")
+    @TableField("profitMoney")
     private BigDecimal profitMoney;
     @ApiModelProperty(value = "毛利率")
+    @TableField("profitRating")
     private BigDecimal profitRating;
-
+    @ApiModelProperty(value = "验光来源 1=外部验光 2=门店修改 3=客户自改")
+    @TableField("profitRating")
+    private Integer optometrySource;
 }

--
Gitblit v1.7.1