From 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 19 Dec 2023 20:43:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
index eb0dca5..bfb6695 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -81,7 +81,7 @@
 	 * 分摊方式
 	 */
 	@ApiModelProperty(value = "分摊方式")
-	private Integer allocationWay;
+	private String allocationWay;
 	/**
 	 * 预算总金额
 	 */

--
Gitblit v1.9.3