From d3dfc07c93ae97cc6a301d9ccf2f8513a6a8ad85 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 10 五月 2023 21:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
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 78220ef..8b62de4 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
@@ -34,6 +34,11 @@
@Excel(name = "璧勯噾鐢宠涓昏〃ID")
private Long rbid;
+ /** 宸梾鎶ラ攢鍗曟槑缁咺D */
+ @ApiModelProperty("宸梾鎶ラ攢鍗曟槑缁咺D")
+ @Excel(name = "宸梾鎶ラ攢鍗曟槑缁咺D")
+ private Long rdid;
+
/** 浜哄憳绫诲埆 */
@ApiModelProperty("浜哄憳绫诲埆")
@Excel(name = "浜哄憳绫诲埆")
@@ -177,15 +182,15 @@
@Excel(name = "鍏朵粬璐圭敤璇存槑")
private String otherfeedesc;
- /** 閲戦-鎺ュ彛 */
- @ApiModelProperty("閲戦-鎺ュ彛")
- @Excel(name = "閲戦-鎺ュ彛")
- private String jine;
-
- /** 鐞嗙敱-鎺ュ彛 */
- @ApiModelProperty("鐞嗙敱-鎺ュ彛")
- @Excel(name = "鐞嗙敱-鎺ュ彛")
- private String liyou;
+// /** 閲戦-鎺ュ彛 */
+// @ApiModelProperty("閲戦-鎺ュ彛")
+// @Excel(name = "閲戦-鎺ュ彛")
+// private String jine;
+//
+// /** 鐞嗙敱-鎺ュ彛 */
+// @ApiModelProperty("鐞嗙敱-鎺ュ彛")
+// @Excel(name = "鐞嗙敱-鎺ュ彛")
+// private String liyou;
}
--
Gitblit v1.9.3