From d5cd8f5f7a981ea9e40d73017905588d1cb6b5c1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 01 一月 2025 14:52:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applet/src/main/java/com/jilongda/applet/model/TOrder.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/model/TOrder.java b/applet/src/main/java/com/jilongda/applet/model/TOrder.java
index 9d9d54e..f89b5cb 100644
--- a/applet/src/main/java/com/jilongda/applet/model/TOrder.java
+++ b/applet/src/main/java/com/jilongda/applet/model/TOrder.java
@@ -158,7 +158,7 @@
private Integer gender;
@ApiModelProperty(value = "微信昵称")
@TableField("name")
- private Integer name;
+ private String name;
@ApiModelProperty(value = "支付方式")
@TableField("payTypeName")
private String payTypeName;
@@ -171,7 +171,7 @@
@ApiModelProperty(value = "毛利率")
@TableField("profitRating")
private BigDecimal profitRating;
- @ApiModelProperty(value = "验光来源")
+ @ApiModelProperty(value = "验光来源 1=外部验光 2=门店修改 3=客户自改")
@TableField("profitRating")
private Integer optometrySource;
}
--
Gitblit v1.7.1