From 1c6d2cc4867b730a055164b75dd1ff43eeb049b0 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 11 五月 2023 15:15:31 +0800
Subject: [PATCH] yxh
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java | 12 +++++++++---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java | 5 +++++
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java
index fdcba62..077b103 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java
@@ -1,15 +1,16 @@
package com.ruoyi.project.domain;
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鎶ラ攢鐢宠鏄庣粏瀵硅薄 service_reimbursementdetail
@@ -70,6 +71,11 @@
@ApiModelProperty("浜ら�氬伐鍏�")
@Excel(name = "浜ら�氬伐鍏�")
private String traffictype;
+ /** 浜ら�氬伐鍏� */
+ @ApiModelProperty("浜ら�氬伐鍏�")
+ @Excel(name = "浜ら�氬伐鍏�")
+ private String traffictype2;
+
/** 甯傚唴浜ら�氳垂 */
@ApiModelProperty("甯傚唴浜ら�氳垂")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java
index 8b62de4..20a6a11 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java
@@ -91,6 +91,11 @@
@Excel(name = "浜ら�氬伐鍏�")
private String traffictype;
+ /** 浜ら�氬伐鍏� */
+ @ApiModelProperty("浜ら�氬伐鍏�")
+ @Excel(name = "浜ら�氬伐鍏�")
+ private String traffictype2;
+
/** 甯傚唴浜ら�氳垂 */
@ApiModelProperty("甯傚唴浜ら�氳垂")
@Excel(name = "甯傚唴浜ら�氳垂")
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
index 8c1ed65..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,personname,persontype 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