From 71725ae55cf54fa85be46f748528e2339643945c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 六月 2025 14:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 74ec628..0a99503 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -53,6 +53,9 @@
     @ApiModelProperty(value= "浠诲姟鍙�")
     private String taskCode;
 
+    @ApiModelProperty("浠诲姟鏉ユ簮")
+    private Short resource;
+
     /**
      * 浠诲姟鐘舵��
      */

--
Gitblit v1.9.1