Commit 0dd04608 authored by wangyangyang's avatar wangyangyang

项目群项目link-修改关联context为context_project

parent 40e66524
...@@ -8,6 +8,7 @@ import cn.hutool.core.convert.Convert; ...@@ -8,6 +8,7 @@ import cn.hutool.core.convert.Convert;
import com.yonde.dex.basedata.entity.annotation.XmlElementProperty; import com.yonde.dex.basedata.entity.annotation.XmlElementProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.fasterxml.jackson.annotation.JsonUnwrapped;
import com.yonde.dex.context.common.vo.DxContextProjectVO;
import com.yonde.dex.context.common.vo.DxContextVO; import com.yonde.dex.context.common.vo.DxContextVO;
import lombok.ToString; import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
...@@ -49,7 +50,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO; ...@@ -49,7 +50,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
public class ExtProgramProjectLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtProgramVO, DxContextVO> ,DxLogicDeleteVOHolder{ public class ExtProgramProjectLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtProgramVO, DxContextProjectVO> ,DxLogicDeleteVOHolder{
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable"; public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable"; public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
...@@ -74,7 +75,7 @@ public class ExtProgramProjectLinkVO extends IdOnlyVO implements IdVO ,DxLinkDat ...@@ -74,7 +75,7 @@ public class ExtProgramProjectLinkVO extends IdOnlyVO implements IdVO ,DxLinkDat
*/ */
@DexEmbedded() @DexEmbedded()
@JsonIgnore @JsonIgnore
private DxLinkDataVOEmbeddable<ExtProgramVO, DxContextVO> dxLinkDataEmbeddable; private DxLinkDataVOEmbeddable<ExtProgramVO, DxContextProjectVO> dxLinkDataEmbeddable;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment