From bbcdd161986fdc1ace1b4c36d73a19370902640b Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 30 六月 2023 12:09:44 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo into yingxh
---
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
index 836de38..0b6e34c 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
@@ -41,7 +41,7 @@
</resultMap>
<sql id="selectServiceReimbursementdetailVo">
- select ID, RBID, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc, OrderNo from service_reimbursementdetail
+ select ID, RBID, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType,TrafficType2, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc, OrderNo,personname,persontype from service_reimbursementdetail
</sql>
<select id="selectServiceReimbursementdetailList" parameterType="ServiceReimbursementdetail" resultMap="ServiceReimbursementdetailResult">
--
Gitblit v1.9.3