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

luliqiang

2020-06-12 abee95ff7de4b3514022b758044e77793f74896f

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