From 7a01315ca8510bffca30199219f88d02a9f86d58 Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Fri, 28 Aug 2026 16:17:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(sys)=EF=BC=9A=E5=AF=BC=E5=87=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BC=98=E5=8C=96=E4=B8=8E=E5=89=8D=E7=AB=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExpenseAccountExportVO.java               | 93 +++++++------------
 1 file changed, 32 insertions(+), 61 deletions(-)

diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/expenseAccount/ExpenseAccountExportVO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/expenseAccount/ExpenseAccountExportVO.java
index a7d59ebaf..31f09e3fc 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/expenseAccount/ExpenseAccountExportVO.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/expenseAccount/ExpenseAccountExportVO.java
@@ -15,53 +15,30 @@ import java.util.Date;
 @Data
 public class ExpenseAccountExportVO {
 
-    @Excel(name = "组织名称")
-    private String organizationName;
-
-    @Excel(name = "科目编码")
-    private String subjectCode;
-
-    @Excel(name = "科目名称")
-    private String subjectName;
-
-    @Excel(name = "显示顺序")
-    private Integer showSeq;
-
-    @Excel(name = "计费属性")
-    private String billingAttributes;
-
-    @Excel(name = "所属模块")
-    private String belongModule;
-
-    @Excel(name = "是否一级科目", readConverterExp = "1=是,2=否")
-    private Integer firstSubjectFlag;
-
-    @Excel(name = "上级科目编码")
-    private String upperSubjectCode;
-
-    @Excel(name = "上级科目名称")
-    private String upperSubject;
-
-    @Excel(name = "科目类型", readConverterExp = "1=系统科目,2=非系统科目")
-    private Integer accountType;
-
-    @Excel(name = "收支类型", readConverterExp = "1=收入,2=支出")
-    private Integer accountExpenseType;
-
-    @Excel(name = "服务项编码")
-    private String serviceItemsCode;
-
-    @Excel(name = "服务项名称")
+    /** 费用类别（关联服务项名称） */
+    @Excel(name = "费用类别")
     private String serviceItemsName;
 
-    @Excel(name = "服务项税率")
+    @Excel(name = "上级科目")
+    private String upperSubject;
+
+    @Excel(name = "费用代码")
+    private String subjectCode;
+
+    @Excel(name = "费用名称")
+    private String subjectName;
+
+    @Excel(name = "税率")
     private BigDecimal taxRate;
 
-    @Excel(name = "费率")
-    private BigDecimal rate;
+    @Excel(name = "创建订单固定显示", readConverterExp = "0=否,1=是")
+    private Integer fixedOrderDisplay;
 
-    @Excel(name = "启用状态", readConverterExp = "1=启用,2=停用")
-    private Integer status;
+    @Excel(name = "入库显示", readConverterExp = "0=否,1=是")
+    private Integer inOrderDisplay;
+
+    @Excel(name = "出库显示", readConverterExp = "0=否,1=是")
+    private Integer outOrderDisplay;
 
     @Excel(name = "自有车辆固定显示", readConverterExp = "1=是,2=否")
     private Integer ownStatus;
@@ -69,30 +46,24 @@ public class ExpenseAccountExportVO {
     @Excel(name = "社会车辆固定显示", readConverterExp = "1=是,2=否")
     private Integer societyStatus;
 
-    @Excel(name = "创建订单固定显示", readConverterExp = "0=否,1=是")
-    private Integer fixedOrderDisplay;
-
-    @Excel(name = "入库单固定显示", readConverterExp = "0=否,1=是")
-    private Integer inOrderDisplay;
-
-    @Excel(name = "出库单固定显示", readConverterExp = "0=否,1=是")
-    private Integer outOrderDisplay;
-
-    @Excel(name = "计费单位")
-    private String billingUnit;
-
-    @Excel(name = "计费单位2")
-    private String billingUnit2;
-
-    @Excel(name = "NC科目编码")
-    private String ncSubjectCode;
-
-    @Excel(name = "备注")
+    @Excel(name = "备注信息")
     private String remark;
 
+    @Excel(name = "状态", readConverterExp = "1=启用,2=停用")
+    private Integer status;
+
     @Excel(name = "创建人")
     private String createByName;
 
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+
+    @Excel(name = "更新人")
+    private String updateByName;
+
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @Excel(name = "所属组织")
+    private String organizationName;
 }