From 51c27e505842ce3343dfabfb994d2fc28ae0d8a8 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 11 三月 2026 14:56:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 7 +++++++
1 files changed, 7 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 82061e7..8b5483d 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
@@ -51,6 +51,11 @@
@ApiModelProperty(value= "浠诲姟鐘舵��")
private Integer taskStatus;
+ /** 鏄惁瀛樺湪鍙墽琛岀殑褰撳墠娴佺▼姝ラ锛岀敤浜庡垪琛ㄦ槸鍚﹀睍绀哄畬鎴愭寜閽� */
+ @TableField(exist = false,select = false)
+ @ApiModelProperty(value = "鏄惁鍙偣鍑诲畬鎴愶紙鏈夊綋鍓嶆楠や笖闈炵粓鎬侊級")
+ private Boolean canComplete;
+
@ApiModelProperty("涓婄骇浠诲姟ID")
private Long parentId;
@@ -216,6 +221,8 @@
private String targLocArea;
+ private String targSiteAreaNow;
+
public Task() {}
public Task(String taskCode,Integer taskStatus,Integer taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Integer sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
--
Gitblit v1.9.1