From a0270d2d70497ce4a0ddcf1e7d27eb822b6694c6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 17:06:00 +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 | 11 +++++++++--
1 files changed, 9 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 1b543af..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,12 +156,18 @@
@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;
@@ -171,7 +177,8 @@
@ApiModelProperty(value = "毛利率")
@TableField("profitRating")
private BigDecimal profitRating;
- @ApiModelProperty(value = "验光来源")
+ @ApiModelProperty(value = "验光来源 1=外部验光 2=门店修改 3=客户自改")
@TableField("profitRating")
private Integer optometrySource;
+
}
--
Gitblit v1.7.1