wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-3282-syl-1' into feature/REQ-3282

Browse Source
This commit is contained in:
songyuanlun 2024-12-23 11:25:07 +08:00
commit b7c54c1c72
5 changed files with 117 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJob.java
View File

@ -133,7 +133,5 @@ public class OrgJob implements Serializable {
* 逻辑删除标识(0：未删除,其它：已删除)
*/
private Long isDelete;
}

30
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroup.java
View File

@ -2,9 +2,12 @@ package cn.axzo.orgmanax.infra.dao.orgjob.entity;
import cn.axzo.orgmanax.api.orgjob.enums.OrgJobGroupFlagEnum;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -25,6 +28,33 @@ public class OrgJobGroup implements Serializable {
private static final long serialVersionUID = 5424203030547622211L;
/**
* 主键
*/
/**
* 主键
*/
@TableId(
type = IdType.AUTO
)
private Long id;
/**
* 创建时间
*/
private Date createAt;
/**
* 更新时间
*/
private Date updateAt;
/**
* 逻辑删除标识(0：未删除,其它：已删除)
*/
private Long isDelete;
/**
* 父节点id
*/

29
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroupRelation.java
View File

@ -1,8 +1,11 @@
package cn.axzo.orgmanax.infra.dao.orgjob.entity;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -23,6 +26,32 @@ public class OrgJobGroupRelation implements Serializable {
private static final long serialVersionUID = 2195750914706800541L;
/**
* 主键
*/
/**
* 主键
*/
@TableId(
type = IdType.AUTO
)
private Long id;
/**
* 创建时间
*/
private Date createAt;
/**
* 更新时间
*/
private Date updateAt;
/**
* 逻辑删除标识(0：未删除,其它：已删除)
*/
private Long isDelete;
/**
* 分组编码
*/

29
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroupRelationHistory.java
View File

@ -1,8 +1,11 @@
package cn.axzo.orgmanax.infra.dao.orgjob.entity;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
@ -23,6 +26,32 @@ import lombok.NoArgsConstructor;
public class OrgJobGroupRelationHistory implements Serializable {
/**
* 主键
*/
/**
* 主键
*/
@TableId(
type = IdType.AUTO
)
private Long id;
/**
* 创建时间
*/
private Date createAt;
/**
* 更新时间
*/
private Date updateAt;
/**
* 逻辑删除标识(0：未删除,其它：已删除)
*/
private Long isDelete;
/**
* 分组编码
*/

29
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobHistory.java
View File

@ -2,10 +2,13 @@ package cn.axzo.orgmanax.infra.dao.orgjob.entity;
import cn.axzo.orgmanax.api.orgjob.enums.OrgJobTypeEnum;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -26,6 +29,32 @@ public class OrgJobHistory implements Serializable {
private static final long serialVersionUID = -273293135363926439L;
/**
* 主键
*/
/**
* 主键
*/
@TableId(
type = IdType.AUTO
)
private Long id;
/**
* 创建时间
*/
private Date createAt;
/**
* 更新时间
*/
private Date updateAt;
/**
* 逻辑删除标识(0：未删除,其它：已删除)
*/
private Long isDelete;
/**
* 编码
*/