From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 12 六月 2024 09:04:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis
---
ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml
index 469b2ca..4ecd4f8 100644
--- a/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml
@@ -43,6 +43,7 @@
<result property="giftReceiveTime" column="gift_receive_time"/>
<result property="deptId" column="dept_id"/>
<result property="isSz" column="is_sz"/>
+ <result property="getType" column="get_type"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
@@ -75,6 +76,7 @@
<result property="updateTime" column="sub_update_time"/>
<result property="updateBy" column="sub_update_by"/>
<result property="deleted" column="sub_deleted"/>
+ <result property="getType" column="get_type"/>
</resultMap>
<sql id="selectMallOrderVo">
@@ -121,7 +123,8 @@
update_time,
update_by,
deleted,
- id_card
+ id_card,
+ get_type
from mall_order
</sql>
@@ -236,6 +239,9 @@
<if test="startTime != null and endTime !=null ">
and create_time between #{startTime} and #{endTime}
</if>
+<!-- <if test="getType != null ">-->
+<!-- and get_type = #{getType}-->
+<!-- </if>-->
</where>
order by update_time desc
</select>
@@ -285,6 +291,7 @@
a.update_time,
a.update_by,
a.deleted,
+ a.get_type,
b.id as
sub_id,
b.order_id as
--
Gitblit v1.8.0