diff --git a/modules/equipment/src/main/java/com/thing/eq/eqby/entity/EqByTemplateDetailEntity.java b/modules/equipment/src/main/java/com/thing/eq/eqby/entity/EqByTemplateDetailEntity.java index f7a96ad..f0545f6 100644 --- a/modules/equipment/src/main/java/com/thing/eq/eqby/entity/EqByTemplateDetailEntity.java +++ b/modules/equipment/src/main/java/com/thing/eq/eqby/entity/EqByTemplateDetailEntity.java @@ -1,10 +1,14 @@ package com.thing.eq.eqby.entity; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; +import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; /** @@ -16,10 +20,12 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @Table("eq_by_template_detail") -public class EqByTemplateDetailEntity { +public class EqByTemplateDetailEntity implements Serializable { + + @Serial private static final long serialVersionUID = 1L; - @Id + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; /** * 保养模板id diff --git a/modules/equipment/src/main/java/com/thing/eq/eqby/service/impl/EqByPlanServiceImpl.java b/modules/equipment/src/main/java/com/thing/eq/eqby/service/impl/EqByPlanServiceImpl.java index 48a1718..4c2a730 100644 --- a/modules/equipment/src/main/java/com/thing/eq/eqby/service/impl/EqByPlanServiceImpl.java +++ b/modules/equipment/src/main/java/com/thing/eq/eqby/service/impl/EqByPlanServiceImpl.java @@ -252,6 +252,8 @@ public class EqByPlanServiceImpl extends BaseServiceImpl details = eqByTemplateDetailService.getDetails(eqByTemplateDTO.getId()); + eqByTemplateDTO.setDatas(details); byTemplateInfos.add(eqByTemplateDTO); } }