From 3f44e29a7e2620bcc498f9d4bf7c454b00225ee2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 10:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
index f55d8d8..4693bee 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
@@ -69,7 +69,7 @@
 
     @ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
     @ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
-    private String objId;
+    private Integer objId;
 
     @ApiModelProperty(value = "鎿嶄綔鍓嶅唴瀹�")
     @ExcelColumn(name="鎿嶄綔鍓嶅唴瀹�")

--
Gitblit v1.9.3