Merge remote-tracking branch 'origin/main'

common/src/main/java/com/sdm/common/entity/req/data/UploadFilesReq.java

@@ -2,6 +2,7 @@ package com.sdm.common.entity.req.data;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sdm.common.entity.enums.FileBizTypeEnum;
 import com.sdm.common.entity.req.system.DictTagReq;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -148,15 +149,19 @@ public class UploadFilesReq {
     private Boolean isConverSameNameFile =  false;
 
     @Schema(description = "x轴物理量（曲线结果使用）")
+    @JsonProperty(value = "xQuantityType")
     private String xQuantityType;
 
     @Schema(description = "x轴结果单位（曲线结果使用）")
+    @JsonProperty(value = "xUnits")
     private String xUnits;
 
     @Schema(description = "y轴物理量（曲线结果使用）")
+    @JsonProperty(value = "yQuantityType")
     private String yQuantityType;
 
     @Schema(description = "y轴结果单位（曲线结果使用）")
+    @JsonProperty(value = "yUnits")
     private String yUnits;
 
     /**

common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java

@@ -143,6 +143,12 @@ public class SpdmTaskVo extends BaseEntity {
     @JsonProperty(value = "eMemberList")
     private List<CIDUserResp> eMemberList;
 
+    /**
+     * 关注人
+     */
+    @JsonProperty(value = "payAttentionMemberList")
+    private List<CIDUserResp> payAttentionMemberList;
+
     /**
      * 0：未关注 1：已关注
      */
@@ -214,12 +220,6 @@ public class SpdmTaskVo extends BaseEntity {
     private String tag9Code;
     private String tag10Code;
 
-    /**
-     * 仿真关注人
-     */
-    @JsonProperty(value = "payAttentionMemberList")
-    private List<CIDUserResp> payAttentionMemberList;
-
     /**
      * 仿真执行人userId
      */