From 6fb14149d62199cfcc0448c82eb2f51f9c5181de Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 31 Dec 2020 16:55:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into parter
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 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..aa7327d 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,6 +1,9 @@
package com.kidgrow.oprationcenter.model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -8,7 +11,9 @@
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
+import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -35,34 +40,59 @@
/**
* 时长(天)
*/
- @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停用
*/
private Boolean enabled;
+// /**
+// * 产品结束时间-供前端使用
+// */
+// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+// private Date endTime;
+// /**
+// * 产品结束时间-供前端使用
+// */
+// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+// @TableField(exist = false)
+// private Date beginTime;
+// /**
+// * 共享，1是，0不
+// */
+// private Boolean isShare;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
}
--
Gitblit v1.8.0