From a04d76dc568b4a13455ea6ca4ae2a92e6387736d Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Wed, 25 Nov 2020 16:36:14 +0800 Subject: [PATCH] Merge branch 'development' into dev --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java index 46ac6c3..633d2fa 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java @@ -50,10 +50,14 @@ @NotEmpty(message = "产品/明细名称不能为空") private String proName; /** - * 产品类型 0试用 1正式 + * 产品类型 0试用 1正式 3 自定义 */ @NotNull(message = "产品类型不能为空") private Integer proType; + /** + * 产品使用期限限制 1有限制,0 无限制 + */ + private Integer termType; /** * 是否共享 0否 1是 */ @@ -66,10 +70,21 @@ @NotEmpty(message = "是否删除,1删除,0未删除不能为空") private Boolean isDel; /** + * 产品的读片总量 + */ + @NotNull(message = "产品的读片总量") + private Integer orderAilightCount; + /** + * 产品的报告总量 + */ + @NotNull(message = "产品的报告总量") + private Integer orderRecordCount; + /** * 读片量 */ @NotNull(message = "读片量不能为空") private Integer ailightCount; + /** * 报告量 */ -- Gitblit v1.8.0