From cdf8f1e691531a6fb1c3462d0ad70df7f68c0047 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Fri, 21 Aug 2020 14:42:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java index c8410a7..64fc544 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java @@ -1,6 +1,5 @@ package com.kidgrow.oprationcenter.model; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -88,9 +87,12 @@ @NotEmpty(message = "需求标签不能为空") private String needTags; /** + * 其他需求标签 + */ + private String needDataRemark; + /** * 是否删除,1删除(已下载),0未删除(未下载) */ - @TableLogic private Boolean isDel; /** * 文件路径 -- Gitblit v1.8.0