gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/group2'

pull/3/head
fengshuonan 2021-01-01 09:13:28 +08:00
parent bc61bd1f9d e2eb6fa56f
commit 46e9de3ca0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java
View File

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

3
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java
View File

@ -1,6 +1,7 @@
package cn.stylefeng.roses.kernel.system.modular.organization.entity; package cn.stylefeng.roses.kernel.system.modular.organization.entity;
import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; 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.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
@ -59,7 +60,7 @@ public class HrPosition extends BaseEntity {
/** /**
* 删除标记：Y-已删除，N-未删除 * 删除标记：Y-已删除，N-未删除
*/ */
@TableField("del_flag") @TableField(value = "del_flag",fill = FieldFill.INSERT)
private String delFlag; private String delFlag;
} }