Merge branch 's-master'

This commit is contained in:
BOE\10867418
2023-06-13 14:55:08 +08:00
4 changed files with 25 additions and 16 deletions

View File

@@ -5,7 +5,8 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.xboe.core.SysConstant;
import com.xboe.core.orm.BaseEntity;
import com.xboe.core.orm.IdBaseEntity;
import com.xboe.core.orm.annotation.MetaInfo;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,14 +18,18 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = false)
@Entity
@Table(name = SysConstant.TABLE_PRE + "organization")
public class Organization extends BaseEntity {
private static final long serialVersionUID = 1L;
public class Organization extends IdBaseEntity {
private static final long serialVersionUID = 1L;
/**
* 原系统ID
*/
@Column(name = "sys_id", length = 36)
private String sysId;
@MetaInfo("删除的")
@Column(name = "deleted", length = 1)
private Boolean deleted;
/**
* 旧系统父id