From 5fccfd521d02ae9a3cd29a0bdc9dcf4b4b179f59 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Fri, 10 Apr 2020 11:40:25 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
index f822277..a38e4f4 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
@@ -1,5 +1,6 @@
 package com.kidgrow.oprationcenter.model;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kidgrow.common.model.SuperModel;
 import lombok.AllArgsConstructor;
@@ -8,6 +9,7 @@
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
@@ -35,31 +37,37 @@
     /**
      * 时长(天)
      */
-    @NotEmpty(message = "时长(天)不能为空")
+    @NotNull(message = "时长不能为空")
     private Integer proTime;
+    /**
+     * 时长单位
+     */
+    @NotNull(message = "时长单位不能为空")
+    private Integer proTimeUnit;
     /**
      * 产品类型 0试用 1正式
      */
-    @NotEmpty(message = "产品类型 0试用 1正式不能为空")
+    @NotNull(message = "产品类型 0试用 1正式不能为空")
     private Integer proType;
     /**
      * 建议售价
      */
-    @NotEmpty(message = "建议售价不能为空")
+    @NotNull(message = "建议售价不能为空")
     private BigDecimal proPrice;
     /**
      * 报告量
      */
-    @NotEmpty(message = "报告量不能为空")
+    @NotNull(message = "报告量不能为空")
     private Integer recordCount;
     /**
      * 读片量
      */
-    @NotEmpty(message = "读片量不能为空")
+    @NotNull(message = "读片量不能为空")
     private Integer ailightCount;
     /**
      * 是否删除,1删除,0未删除
      */
+    @TableLogic
     private Boolean isDel;
     /**
      * 状态,1启用,0停用

--
Gitblit v1.8.0