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 | 2 +-
manage/src/main/resources/mapping/TOrderAftersalesMapper.xml | 2 +-
applet/src/main/java/com/jilongda/applet/model/TOrder.java | 2 +-
3 files changed, 3 insertions(+), 3 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..a54a666 100644
--- a/applet/src/main/java/com/jilongda/applet/model/TOrder.java
+++ b/applet/src/main/java/com/jilongda/applet/model/TOrder.java
@@ -171,7 +171,7 @@
@ApiModelProperty(value = "毛利率")
@TableField("profitRating")
private BigDecimal profitRating;
- @ApiModelProperty(value = "验光来源")
+ @ApiModelProperty(value = "验光来源 1=外部验光 2=门店修改 3=客户自改")
@TableField("profitRating")
private Integer optometrySource;
}
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..2be141a 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrder.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
@@ -171,7 +171,7 @@
@ApiModelProperty(value = "毛利率")
@TableField("profitRating")
private BigDecimal profitRating;
- @ApiModelProperty(value = "验光来源")
+ @ApiModelProperty(value = "验光来源 1=外部验光 2=门店修改 3=客户自改")
@TableField("profitRating")
private Integer optometrySource;
}
diff --git a/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml b/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
index a4ca94c..bcd69d1 100644
--- a/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
+++ b/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
@@ -24,7 +24,7 @@
</sql>
<select id="pageList" resultType="com.jilongda.manage.vo.TOrderAftersalesVO">
select toa.id, toa.code, toa.sysId, toa.optometristId, toa.orderId, toa.reason, toa.handleResult, toa.createTime, toa.updateTime,
- toa.createBy, toa.updateBy, toa.isDelete,tau.name, tau.phone, tau.realName, ts.storeName, o.orderMoney
+ toa.createBy, toa.updateBy, toa.isDelete,tau.name, tau.phone, tau.realName, ts.name as storeName, o.orderMoney
from t_order_aftersales toa
left join t_app_user tau on toa.sysId = tau.id
left join t_store ts on toa.storeId = ts.id
--
Gitblit v1.7.1