diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/BasicInfo.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/BasicInfo.java index 1a2b24f..09fd005 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/BasicInfo.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/BasicInfo.java @@ -1,20 +1,65 @@ package cn.toesbieya.jxc.model.entity1; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import lombok.ToString; -import org.springframework.data.annotation.Id; +import java.io.Serializable; -@Data -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -public class BasicInfo extends Change{ - @Id - private Integer id; - private String name; - private Integer manufactureId; - private Integer typeId; - private Integer riskId; +import javax.persistence.Column; +/** + * + * @author Jpanda [Jpanda@aliyun.com] + * @version 1.0 + * @since 2022-02-28 + */ +@Getter +@Setter +@ToString +public class BasicInfo implements Serializable { + private static final long serialVersionUID = 7109045896642391211L; + + @Column + private Integer id; + /** + * 试剂名称 + */ + @Column + private String name; + /** + * 试剂厂商 + */ + @Column + private Integer manufactureId; + /** + * 试剂类型 + */ + @Column + private Integer typeId; + /** + * 危险说明 + */ + @Column + private Integer riskId; + /** + * 创建人id + */ + @Column + private Integer creatorId; + /** + * 创建时间 + */ + @Column + private Long createTime; + /** + * 修改人id + */ + @Column + private Integer updateId; + /** + * 修改时间 + */ + @Column + private Long updateTime; } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/DetailInfo.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/DetailInfo.java index f1df274..3f7a97e 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/DetailInfo.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/DetailInfo.java @@ -1,23 +1,88 @@ package cn.toesbieya.jxc.model.entity1; -import lombok.Data; -import lombok.EqualsAndHashCode; + +import lombok.Getter; +import lombok.Setter; import lombok.ToString; -import org.springframework.data.annotation.Id; +import java.io.Serializable; +import javax.persistence.Column; + +/** + * + * @author 强子烨 + * @version 1.0 + * @since 2022-02-28 + */ +@Getter +@Setter +@ToString +public class DetailInfo implements Serializable { -@Data -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -public class DetailInfo extends Change{ - @Id - private Integer id; - private Integer basicId; - private Long productionDate; - private Integer effective; - private Integer batchId; - private String specification; - private Integer unitId; - private Integer status; - private String remark; + private static final long serialVersionUID = 2581056154795300744L; + /** + * 试剂id + */ + @Column + private Integer id; + /** + * 基础信息id + */ + @Column + private Integer basicId; + /** + * 生产日期 + */ + @Column + private Long productionDate; + /** + * 有效期(天) + */ + @Column + private Integer effective; + /** + * 产品批次 + */ + @Column + private Integer batchId; + /** + * 规格 + */ + @Column + private String specification; + /** + * 单位 + */ + @Column + private String unitId; + /** + * 状态,0停用,1启用 + */ + @Column + private Integer status; + /** + * 创建人id + */ + @Column + private Integer creatorId; + /** + * 创建时间 + */ + @Column + private Long createTime; + /** + * 修改人id + */ + @Column + private Integer updateId; + /** + * 修改时间 + */ + @Column + private Long updateTime; + /** + * 备注 + */ + @Column + private String remark; } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Location.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Location.java index 7cea765..c972192 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Location.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Location.java @@ -1,19 +1,68 @@ package cn.toesbieya.jxc.model.entity1; -import lombok.Data; -import lombok.EqualsAndHashCode; + +import lombok.Getter; +import lombok.Setter; import lombok.ToString; -import org.springframework.data.annotation.Id; +import java.io.Serializable; +import javax.persistence.Column; + +/** + * + * @author 强子烨 + * @version 1.0 + * @since 2022-02-28 + */ +@Getter +@Setter +@ToString +public class Location implements Serializable { -@Data -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -public class Location extends Change{ - @Id - private Integer id; - private String name; - private Integer containerId; - private Integer storehouseId; - private Integer status; + private static final long serialVersionUID = 8197662636671266111L; + /** + * 货位id + */ + @Column + private Integer id; + /** + * 货位名称 + */ + @Column + private String name; + /** + * 货柜id + */ + @Column + private Integer containerId; + /** + * 仓库id + */ + @Column + private Integer storehouseId; + /** + * 状态,0停用,1启用 + */ + @Column + private Integer status; + /** + * 创建人id + */ + @Column + private Integer creatorId; + /** + * 创建时间 + */ + @Column + private Long createTime; + /** + * 修改人id + */ + @Column + private Integer updateId; + /** + * 修改时间 + */ + @Column + private Long updateTime; }