From 8858d80de8896cb1e94ec809e9012e3eb575132a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 15:35:12 +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 | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..455de5a 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrder.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
@@ -158,15 +158,20 @@
private Integer gender;
@ApiModelProperty(value = "微信昵称")
@TableField("name")
- private Integer name;
+ private String name;
@ApiModelProperty(value = "支付方式")
@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