Merge remote-tracking branch 'origin/dev' into dev

zhaoxiaohao

2020-04-10 eab02ab1453dc1f1e9933077dde1cef67d798936

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.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;
@@ -76,6 +77,7 @@
    /**
     * 是否删除，1删除，0未删除
     */
    @TableLogic
    @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
    private Boolean isDel;
    /**