From c977f0e2fd86ca3e9e3ad3961f702206c41d2767 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 10:41:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/services/src/main/java/com/doumee/dao/business/model/Transactions.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java b/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
index 91c04df..99918c9 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
@@ -63,7 +63,7 @@
     @ExcelColumn(name="浜ゆ槗閲戦")
     private BigDecimal money;
 
-    @ApiModelProperty(value = "浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1缁撶畻瀹為檯娑堣垂 2缁撶畻閫�娆� 3骞冲彴閫�娆�", example = "1")
+    @ApiModelProperty(value = "浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1缁撶畻瀹為檯娑堣垂 2缁撶畻閫�娆� 3骞冲彴閫�娆� 4璐拱濂楅 ", example = "1")
     @ExcelColumn(name="浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1缁撶畻瀹為檯娑堣垂 2缁撶畻閫�娆� 3骞冲彴閫�娆�")
     private Integer type;
 
@@ -91,8 +91,8 @@
     @ExcelColumn(name="鐢ㄦ埛褰撳墠浣欓(鍒嗭級")
     private BigDecimal balance;
 
-    @ApiModelProperty(value = "浜ゆ槗鍏宠仈瀵硅薄绫诲瀷 0璁㈠崟 1閫�娆惧崟", example = "1")
-    @ExcelColumn(name="浜ゆ槗鍏宠仈瀵硅薄绫诲瀷 0璁㈠崟 1閫�娆惧崟")
+    @ApiModelProperty(value = "浜ゆ槗鍏宠仈瀵硅薄绫诲瀷 0璁㈠崟 1閫�娆惧崟 2濂楅璐拱", example = "1")
+    @ExcelColumn(name="浜ゆ槗鍏宠仈瀵硅薄绫诲瀷 0璁㈠崟 1閫�娆惧崟 2濂楅璐拱")
     private Integer objType;
 
     @ApiModelProperty(value = "浜ゆ槗鍏宠仈瀵硅薄缂栫爜")

--
Gitblit v1.9.3