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

houruijun

2020-09-01 d485902ae91b906ce542e51936bd460f0a3a5b08

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRoleOrganization.java

@@ -1,10 +1,7 @@
package com.kidgrow.usercenter.model;

import com.baomidou.mybatisplus.annotation.*;
import com.kidgrow.common.model.SuperModel;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -50,5 +47,6 @@
    /**
     * 是否删除，1删除，0未删除
     */
    @TableLogic
    private Boolean isDel;
}