From f7a3d41075e00498f7033475108c0bcd86cda733 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 01 七月 2025 14:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 a84af6d..dbf18a2 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -29,6 +30,7 @@
this.createDate =apply.getEditDate();
this.creator =apply.getEditor();
this.objId=objId;
+ this.isdeleted = Constants.ZERO;
this.objType = objType;
this.beforeContent=before;
this.settleClainmsId=apply.getId();
@@ -93,6 +95,13 @@
@ExcelColumn(name="鎿嶄綔鍚庡唴瀹�")
private String afterContent;
+ @ApiModelProperty(value = "澶х被绫诲瀷锛�1=鎶ユ 2=绔嬫 3=鍙楃悊 4=鐞嗙畻 5=鏍歌禂 6=缁撴 7=绔嬫閫�鍥� 8鍟嗚閫�鍥� 9宸叉挙妗�")
+ private Integer parentStatus;
+
+ @ApiModelProperty(value = "涓氬姟绫诲瀷")
+ private Integer status;
+
+
@ApiModelProperty(value = "鍒涘缓浜哄悕绉�", example = "1")
@TableField(exist = false)
private String creatorName;
--
Gitblit v1.9.3