From d5bf846770b001cac64ca27a3fe2886a9c5076b3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 19:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java
index 8d8d2bc..39b7a99 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java
@@ -63,7 +63,6 @@
 
     @ApiModelProperty(value = "删除状态(0=否,1=是)")
     @TableField("del_flag")
-    @TableLogic
     private Integer delFlag;
 
     @ApiModelProperty(value = "添加时间")
@@ -76,7 +75,7 @@
 
     @ApiModelProperty(value = "对象id")
     @TableField("object_id")
-    private String objectId;
+    private Long objectId;
     @TableField(exist = false)
     private String authName;
     @TableField(exist = false)

--
Gitblit v1.7.1