From bbf8efb4cf186a753128a88822cfd28af46a0f38 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 03 六月 2025 14:56:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java | 44 ++++++++++----------------------------------
1 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
index 4720e33..66db19d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
@@ -16,37 +16,6 @@
public class SpStatExpense {
private static final long serialVersionUID = 1L;
- /**
- * 缁╂晥鏃ユ湡
- */
- @ApiModelProperty("缁╂晥鏃ユ湡")
- private String pabegtime;
-
- /**
- * 閮ㄩ棬id
- */
- @ApiModelProperty("閮ㄩ棬id")
- private String paendtime;
-
- /**
- * 閮ㄩ棬鍚嶇О
- */
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
- private String padeptno;
-
- /**
- * 鏀剁泭浜虹紪鍙�
- */
- @ApiModelProperty("鏀剁泭浜虹紪鍙�")
- @Excel(name = "鏀剁泭浜虹紪鍙�")
- private String pauserno;
-
- /**
- * 鏀剁泭浜虹紪鍙�
- */
- @ApiModelProperty("鏀剁泭浜虹紪鍙�")
- @Excel(name = "鏀剁泭浜虹紪鍙�")
- private String paexpensetype;
/**
* 鏀剁泭浜虹紪鍙�
@@ -79,8 +48,8 @@
/**
* 鏀剁泭浜虹紪鍙�
*/
- @ApiModelProperty("鏀剁泭浜虹紪鍙�")
- @Excel(name = "鏀剁泭浜虹紪鍙�")
+ @ApiModelProperty("鏀剁泭浜�")
+ @Excel(name = "鏀剁泭浜�")
private String deptmentName;
/**
@@ -88,7 +57,14 @@
*/
@ApiModelProperty("鏀剁泭浜虹紪鍙�")
@Excel(name = "鏀剁泭浜虹紪鍙�")
- private String amount;
+ private String AmountRequested;
+
+ /**
+ * 鏀剁泭浜虹紪鍙�
+ */
+ @ApiModelProperty("鏀剁泭浜虹紪鍙�")
+ @Excel(name = "鏀剁泭浜虹紪鍙�")
+ private String applyType;
}
--
Gitblit v1.9.3