From ae940502b8431e4773d030bc9cb2d05f0ec6cecf Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 10 五月 2023 21:22:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 dffa2e6..fdcba62 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
@@ -64,7 +64,7 @@
/** 浜ら�氳垂 */
@ApiModelProperty("浜ら�氳垂")
@Excel(name = "浜ら�氳垂")
- private Double trafficexpense;
+ private BigDecimal trafficexpense;
/** 浜ら�氬伐鍏� */
@ApiModelProperty("浜ら�氬伐鍏�")
@@ -74,12 +74,12 @@
/** 甯傚唴浜ら�氳垂 */
@ApiModelProperty("甯傚唴浜ら�氳垂")
@Excel(name = "甯傚唴浜ら�氳垂")
- private Double cityfee;
+ private BigDecimal cityfee;
/** 浣忓璐� */
@ApiModelProperty("浣忓璐�")
@Excel(name = "浣忓璐�")
- private Double hotelexpense;
+ private BigDecimal hotelexpense;
/** 鍙戠エ寮犳暟 */
@ApiModelProperty("鍙戠エ寮犳暟")
@@ -94,17 +94,17 @@
/** 鏉傝垂 */
@ApiModelProperty("鏉傝垂")
@Excel(name = "鏉傝垂")
- private Double otherexpense;
+ private BigDecimal otherexpense;
/** 浼欓璐� */
@ApiModelProperty("浼欓璐�")
@Excel(name = "浼欓璐�")
- private Double foodexpenses;
+ private BigDecimal foodexpenses;
/** 浼欓璐硅ˉ鍔� */
@ApiModelProperty("浼欓璐硅ˉ鍔�")
@Excel(name = "浼欓璐硅ˉ鍔�")
- private Double foodallowance;
+ private BigDecimal foodallowance;
/** 闄勪欢琛� */
@ApiModelProperty("闄勪欢琛�")
@@ -154,11 +154,14 @@
@Excel(name = "鎵�灞炶閬擄紙闀囷級鍚嶇О")
private String traveltownname;
- private Double otherfeeamount;
+ private BigDecimal otherfeeamount;
private String otherfeedesc;
private Integer orderno;
+ private String persontype;
+ private String personname;
+
}
--
Gitblit v1.9.3