Merge branch 'test' into dev

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java

eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductGroup.java

@@ -1,18 +1,3 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
 package cn.ysk.cashier.pojo.product;
 
 import lombok.Data;
@@ -86,6 +71,17 @@ public class TbProductGroup implements Serializable {
     @ApiModelProperty(value = "updatedAt")
     private Long updatedAt;
 
+    @NotNull
+    @Column(name = "`use_time`",nullable = false)
+    @ApiModelProperty(value = "是否开启时间管控")
+    private Integer useTime = 0;
+
+    @Column(name = "`sale_start_time`")
+    private String saleStartTime;
+
+    @Column(name = "`sale_end_time`")
+    private String saleEndTime;
+
     public void copy(TbProductGroup source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }