From 3ecb43bd5455df7c541d382370c981c4ffa24853 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 16:13:49 +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/ProductOrder.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
index 42f4dff..797c2d2 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.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;
@@ -12,6 +11,7 @@
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.util.Date;
@@ -64,6 +64,10 @@
*/
@NotEmpty(message = "合同名称不能为空")
private String contractTitle;
+
+ @NotNull(message = "合同名数量不能为空")
+ @Min(1)
+ private Integer contractNum;
/**
* 合同开始时间
*/
@@ -82,7 +86,6 @@
/**
* 是否删除，1删除，0未删除
*/
- @TableLogic
private Boolean isDel;
/**
* 状态，1启用，0停用
--
Gitblit v1.8.0