Merge remote-tracking branch 'origin/group2'

pull/3/head
fengshuonan 2021-01-01 09:13:28 +08:00
commit 46e9de3ca0
2 changed files with 5 additions and 2 deletions

View File

@ -1,11 +1,13 @@
package cn.stylefeng.roses.kernel.system.modular.organization.entity;
import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.ibatis.annotations.Insert;
import java.math.BigDecimal;
@ -71,7 +73,7 @@ public class HrOrganization extends BaseEntity {
/**
* Y-N-
*/
@TableField("del_flag")
@TableField(value = "del_flag",fill = FieldFill.INSERT)
private String delFlag;
}

View File

@ -1,6 +1,7 @@
package cn.stylefeng.roses.kernel.system.modular.organization.entity;
import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -59,7 +60,7 @@ public class HrPosition extends BaseEntity {
/**
* Y-N-
*/
@TableField("del_flag")
@TableField(value = "del_flag",fill = FieldFill.INSERT)
private String delFlag;
}