From 92f43487ae2d2147cea2f9930ddeb61f98edb5e9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 17:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/model/TOrder.java | 14 +++++++++++++-
1 files changed, 13 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..00bd2ed 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrder.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
@@ -156,17 +156,29 @@
@ApiModelProperty(value = "用户性别 1男2女")
@TableField("gender")
private Integer gender;
+ @ApiModelProperty(value = "收费项id")
+ @TableField("itemsId")
+ private Integer itemsId;
@ApiModelProperty(value = "微信昵称")
@TableField("name")
- private Integer name;
+ private String name;
@ApiModelProperty(value = "支付方式")
@TableField("payTypeName")
private String payTypeName;
+ @ApiModelProperty(value = "确认结算后的支付方式和金额")
+ @TableField("confirmPayType")
+ private String confirmPayType;
@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