From 4837d8e606a630945a8150cd8dff3fb0e48f0784 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 20 六月 2024 14:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDevOpsTaskClaimInfo.java |  113 ++++++++++++++++++++------------------------------------
 1 files changed, 40 insertions(+), 73 deletions(-)

diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDevOpsTaskClaimInfo.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDevOpsTaskClaimInfo.java
index beb6954..eec6e72 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDevOpsTaskClaimInfo.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDevOpsTaskClaimInfo.java
@@ -1,86 +1,53 @@
 package com.dy.pmsGlobal.pojoSta;
 
-import java.io.Serializable;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+
+
+
 import java.util.Date;
-import lombok.Data;
 
 /**
- * 瀹夎杩愮淮浠诲姟璁ら琛�
- * @TableName sta_dev_ops_task_claim_info
- */
+* 瀹夎杩愮淮浠诲姟璁ら琛�
+* @TableName sta_dev_ops_task_claim_info
+*/
+@TableName(value="sta_dev_ops_task_claim_info", autoResultMap = true)
 @Data
-public class StaDevOpsTaskClaimInfo implements Serializable {
-    /**
-     * 
-     */
-    private Long id;
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class StaDevOpsTaskClaimInfo implements BaseEntity {
 
     /**
-     * 鐢ㄦ埛瀹炰綋缂栧彿
-     */
-    private Long userId;
-
+    * 
+    */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long id;
     /**
-     * 瀹夎杩愮淮浠诲姟瀹炰綋缂栧彿
-     */
-    private Long planId;
-
+    * 鐢ㄦ埛瀹炰綋缂栧彿
+    */
+    @NotNull(message="[鐢ㄦ埛瀹炰綋缂栧彿]涓嶈兘涓虹┖")
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long userId;
     /**
-     * 浠诲姟璁ら鏃堕棿
-     */
-    private Date dt;
-
+    * 瀹夎杩愮淮浠诲姟瀹炰綋缂栧彿
+    */
+    @NotNull(message="[瀹夎杩愮淮浠诲姟瀹炰綋缂栧彿]涓嶈兘涓虹┖")
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long planId;
     /**
-     * 鐘舵��:姝e父(1)銆佺粨鏉�(0)
-     */
-    private Integer status;
+    * 浠诲姟璁ら鏃堕棿
+    */
+    public Date dt;
+    /**
+    * 鐘舵��:姝e父(1)銆佺粨鏉�(0)
+    */
+    public Integer status;
 
-    private static final long serialVersionUID = 1L;
 
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        StaDevOpsTaskClaimInfo other = (StaDevOpsTaskClaimInfo) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
-            && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
-            && (this.getDt() == null ? other.getDt() == null : this.getDt().equals(other.getDt()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
-        result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
-        result = prime * result + ((getDt() == null) ? 0 : getDt().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", userId=").append(userId);
-        sb.append(", planId=").append(planId);
-        sb.append(", dt=").append(dt);
-        sb.append(", status=").append(status);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0