From 3613b6d83a18633b87ae63fe8b4bb133078213f8 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 25 Apr 2026 16:11:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?refactor(oa):=20=E9=9C=80=E6=B1=82=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84Vo=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 继承 BaseEntity 类以统一实体基类功能 - 添加 BaseEntity 依赖导入以支持基础属性扩展 - 保持现有数据传输对象结构不变 --- .../src/main/java/com/ruoyi/oa/domain/vo/OaRequirementsVo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaRequirementsVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaRequirementsVo.java index 6ea78c6..2db8b77 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaRequirementsVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaRequirementsVo.java @@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; +import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; import java.util.Date; @@ -19,7 +20,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -public class OaRequirementsVo { +public class OaRequirementsVo extends BaseEntity { private static final long serialVersionUID = 1L; From 2ac3901f75f7c07780beda3fe39c96285390ea0f Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 27 Apr 2026 14:42:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(hrm):=20=E6=B7=BB=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=8A=84=E9=80=81=E6=A0=87=E8=AE=B0=E5=B7=B2=E8=AF=BB?= =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 扩展操作列宽度从100到150以适应新功能 - 添加标记未读链接在已读状态下显示 - 实现handleUnread方法用于取消已读状态 - 优化表格操作按钮布局结构 --- ruoyi-ui/src/views/hrm/flow/cc.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/hrm/flow/cc.vue b/ruoyi-ui/src/views/hrm/flow/cc.vue index a2ca8d4..6f64d20 100644 --- a/ruoyi-ui/src/views/hrm/flow/cc.vue +++ b/ruoyi-ui/src/views/hrm/flow/cc.vue @@ -37,11 +37,14 @@ {{ parseTime(scope.row.createTime) }} - +