Merge remote-tracking branch 'origin/master'

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtDisReocredLinkVO.java

@@ -48,7 +48,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-public class ExtDisReocredLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtDistributeRecordVO, IdOnlyVO> ,DxLogicDeleteVOHolder{
+public class ExtDisReocredLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtDistributeRecordVO, IdOnlyVO>{
 
     public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
     public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
@@ -61,12 +61,6 @@ public class ExtDisReocredLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOH
     @JsonIgnore
     private DxIdVOEmbeddable dxIdEmbeddable;
 
-    /**
-    * 扩展VO属性
-    */
-    @DexEmbedded()
-    @JsonIgnore
-    private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
 
     /**
     * 扩展VO属性

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/shadow/ExtDisReocredLinkServiceShadow.java

@@ -11,6 +11,6 @@ import com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService;
 * @version: V
 * @date: 2024-7-26 9:34:06
 **/
-public interface ExtDisReocredLinkServiceShadow<V extends ExtDisReocredLinkVO> extends ExtDisReocredLinkServiceFeign<V>, BaseIdEntityService<V> ,LogicDeleteService<V> ,DxLinkDataService<V> {
+public interface ExtDisReocredLinkServiceShadow<V extends ExtDisReocredLinkVO> extends ExtDisReocredLinkServiceFeign<V>, BaseIdEntityService<V> ,DxLinkDataService<V> {
 
 }