From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java
index e7fdd67..4b23043 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/TaskResult.java
@@ -1,12 +1,13 @@
package com.vincent.rsf.openApi.entity.phyz;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
@@ -17,8 +18,10 @@
// 浠诲姟鍙凤紝鍞竴鏍囪瘑
@NotNull
@JsonProperty("TaskNo")
+ @JSONField(name = "TaskNo")
private String taskNo;
- // 鐘舵��
+ // 鐘舵�� //1鎼 2瀹屾垚 9鍙栨秷
@JsonProperty("Status")
- private String status;
+ @JSONField(name = "Status")
+ private Integer status;
}
--
Gitblit v1.9.1