From ca0720d39d9b6697cd70c14bd0f9ef3f2778382c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 20 五月 2024 21:33:05 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductScrappingReason.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductScrappingReason.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductScrappingReason.java
index 4cafd47..6e2346d 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductScrappingReason.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductScrappingReason.java
@@ -1,11 +1,13 @@
package com.dy.pmsGlobal.pojoPlt;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
import lombok.*;
/**
@@ -18,24 +20,13 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class PltProductScrappingReason{
+public class PltProductScrappingReason implements BaseEntity {
/**
*
*/
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.AUTO)
public Long id;
-
- /**
- * 浜у搧瀹炰綋缂栧彿
- */
- @NotNull(message = "浜у搧瀹炰綋缂栧彿涓嶈兘涓虹┖")
- public Long proId;
-
- /**
- * 浜у搧鍚嶇О
- */
- @TableField(exist = false)
- public String proName;
/**
* 鎶ュ簾鍘熷洜
@@ -44,6 +35,10 @@
public String reason;
/**
+ * 鏄惁绂佺敤锛�1鏄紝0鍚�
+ */
+ public Boolean disabled;
+ /**
* 鏄惁鍒犻櫎锛�1鏄紝0鍚�
*/
public Boolean deleted;
--
Gitblit v1.8.0