修改版本

dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/common/vo/ExtProgramProjectLinkVO.java

 package com.yonde.dex.basic.common.vo;
 
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import cn.hutool.core.convert.Convert;
-import com.yonde.dex.basedata.entity.annotation.XmlElementProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import com.yonde.dex.context.common.vo.DxContextVO;
-import lombok.ToString;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.math.BigInteger;
-import org.springframework.data.annotation.Transient;
-import lombok.experimental.Delegate;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.XmlAttribute;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.NotNull;
-import java.util.List;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.yonde.dex.basedata.entity.xmladapters.LocalDateTimeXmlAdapter;
-import lombok.Data;
-import com.yonde.dex.basedata.entity.annotation.*;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.TypeReference;
-import com.yonde.dex.basedata.entity.data.VersionRelationType;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
+import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
+import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
 import com.yonde.dex.basedata.entity.vo.IdVO;
-import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
+import com.yonde.dex.context.common.vo.DxContextVO;
 import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable;
-import com.yonde.dex.basedata.entity.users.DxUserVO;
+import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
+import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
+import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
-* @description: ExtProgramProjectLink-VO
-* @author: dexadmin
-* @version: V
-* @date: 2024-8-28 17:09:04
-**/
+ * @description: ExtProgramProjectLink-VO
+ * @author: dexadmin
+ * @version: V
+ * @date: 2024-8-30 14:05:32
+ **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramProjectLinkVO.class)
 @EqualsAndHashCode(callSuper = true)
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/common/vo/ExtProgramVO.java

@@ -14,8 +14,6 @@ import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbedda
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
 import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
 import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
 import com.yonde.dex.user.common.vo.DxOrganizationVO;
@@ -31,18 +29,17 @@ import java.util.List;
  * @description: ExtProgram-VO
  * @author: dexadmin
  * @version: V
- * @date: 2024-8-28 17:09:04
+ * @date: 2024-8-30 14:05:32
  **/
-@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramVO.class)
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramVO.class)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-public class ExtProgramVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
+public class ExtProgramVO extends IdOnlyVO implements IdVO, DxLifecycleManageBaseVOHolder, DxObjFileLinkVOHolder, DxSecretVOHolder {
 
     public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
     public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable";
     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_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
     public static final String BUDGET_AMOUNT_PROP_NAME = "budgetAmount";
     public static final String CUSTOM_UNIT_PROP_NAME = "customUnit";
@@ -84,13 +81,6 @@ public class ExtProgramVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBas
     @JsonIgnore
     private DxIdVOEmbeddable dxIdEmbeddable;
 
-    /**
-    * 扩展VO属性
-    */
-    @DexEmbedded()
-    @JsonIgnore
-    private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
-
     /**
     * 扩展VO属性
     */

dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/expand/entity/DxViewVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.basic.expand.plugin.DxViewVOPluginExpand;
 * @description: DxView-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/expand/plugin/DxViewVOPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.basic.expand.entity.DxViewVOExpand;
 * @description: DxView-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxViewVOPluginExpand<V extends DxViewVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextEnterpriseVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.context.expand.entity.DxContextVOExpand;
 * @description: DxContextEnterprise-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextLibraryVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.context.expand.entity.DxContextVOExpand;
 * @description: DxContextLibrary-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextProductionVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.context.expand.entity.DxContextVOExpand;
 * @description: DxContextProduction-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextProjectVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.context.expand.entity.DxContextVOExpand;
 * @description: DxContextProject-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextTeamMemberVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.context.expand.plugin.DxContextTeamMemberVOPluginExpand;
 * @description: DxContextTeamMember-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextTeamVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.context.expand.plugin.DxContextTeamVOPluginExpand;
 * @description: DxContextTeam-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextVOExpand.java

@@ -9,7 +9,6 @@ import com.yonde.dex.basedata.entity.data.VersionRelationType;
 import com.yonde.dex.basic.common.vo.ExtProgramProjectLinkVO;
 import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
 import com.yonde.dex.user.common.vo.DxOrganizationVO;
 import com.yonde.dex.user.common.vo.DxUserInfoVO;
@@ -25,14 +24,13 @@ import java.util.List;
  * @description: DxContext-VOExpand扩展实体
  * @author: dexadmin
  * @version: V
- * @date: 2024-8-28 17:09:03
+ * @date: 2024-8-30 14:05:32
  **/
 @EqualsAndHashCode
 @Data
 @ToString(callSuper = true)
 public class DxContextVOExpand<V extends DxContextVOPluginExpand> implements Serializable{
     public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
-    public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
     public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
     public static final String BUDGET_AMOUNT_PROP_NAME = "budgetAmount";
     public static final String CUSTOM_UNIT_PROP_NAME = "customUnit";
@@ -60,13 +58,6 @@ public class DxContextVOExpand<V extends DxContextVOPluginExpand> implements Ser
     @JsonIgnore
     private DxObjFileLinkVOEmbeddable dxObjFileLinkEmbeddable;
 
-    /**
-    * 扩展VO属性
-    */
-    @DexEmbedded()
-    @JsonIgnore
-    private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
-
     /**
     * 扩展VO属性
     */

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextEnterpriseVOPluginExpand.java

@@ -6,7 +6,7 @@ import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 * @description: DxContextEnterprise-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxContextEnterpriseVOPluginExpand<V extends DxContextEnterpriseVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextLibraryVOPluginExpand.java

@@ -6,7 +6,7 @@ import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 * @description: DxContextLibrary-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxContextLibraryVOPluginExpand<V extends DxContextLibraryVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextProductionVOPluginExpand.java

@@ -6,7 +6,7 @@ import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 * @description: DxContextProduction-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxContextProductionVOPluginExpand<V extends DxContextProductionVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextProjectVOPluginExpand.java

@@ -6,7 +6,7 @@ import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 * @description: DxContextProject-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxContextProjectVOPluginExpand<V extends DxContextProjectVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextTeamMemberVOPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.context.expand.entity.DxContextTeamMemberVOExpand;
 * @description: DxContextTeamMember-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxContextTeamMemberVOPluginExpand<V extends DxContextTeamMemberVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextTeamVOPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.context.expand.entity.DxContextTeamVOExpand;
 * @description: DxContextTeam-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 public interface DxContextTeamVOPluginExpand<V extends DxContextTeamVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextVOPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.context.expand.entity.DxContextVOExpand;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
@@ -11,9 +9,9 @@ import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbedda
 * @description: DxContext-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
-public interface DxContextVOPluginExpand<V extends DxContextVOPluginExpand> extends DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
+public interface DxContextVOPluginExpand<V extends DxContextVOPluginExpand> extends DxObjFileLinkVOHolder ,DxSecretVOHolder{
 
     DxContextVOExpand<V> getDxContextExpand();
 
@@ -24,18 +22,10 @@ public interface DxContextVOPluginExpand<V extends DxContextVOPluginExpand> exte
         getDxContextExpand().setDxObjFileLinkEmbeddable(dxObjFileLinkVOEmbeddable);
     }
     @Override
-    default void setDxLogicDeleteEmbeddable(DxLogicDeleteVOEmbeddable dxLogicDeleteVOEmbeddable) {
-        getDxContextExpand().setDxLogicDeleteEmbeddable(dxLogicDeleteVOEmbeddable);
-    }
-    @Override
     default void setDxSecretEmbeddable(DxSecretVOEmbeddable dxSecretVOEmbeddable) {
         getDxContextExpand().setDxSecretEmbeddable(dxSecretVOEmbeddable);
     }
     @Override
-    default DxLogicDeleteVOEmbeddable getDxLogicDeleteEmbeddable() {
-        return getDxContextExpand().getDxLogicDeleteEmbeddable();
-    }
-    @Override
     default DxObjFileLinkVOEmbeddable getDxObjFileLinkEmbeddable() {
         return getDxContextExpand().getDxObjFileLinkEmbeddable();
     }

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxGroupLinkVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxGroupLinkVOPluginExpand;
 * @description: DxGroupLink-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxGroupMemberLinkVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxGroupMemberLinkVOPluginExpand;
 * @description: DxGroupMemberLink-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxGroupVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalVOExpand;
 * @description: DxGroup-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxOrganizationGroupLinkVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxOrganizationGroupLinkVOPluginExpand;
 * @description: DxOrganizationGroupLink-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxOrganizationVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalVOExpand;
 * @description: DxOrganization-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxPostMemberLinkVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxPostMemberLinkVOPluginExpand;
 * @description: DxPostMemberLink-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxPostVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxPostVOPluginExpand;
 * @description: DxPost-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxPrincipalLinkVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalLinkVOPluginExpand;
 * @description: DxPrincipalLink-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxPrincipalVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 * @description: DxPrincipal-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxUserInfoVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalVOExpand;
 * @description: DxUserInfo-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupLinkVOPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.user.expand.entity.DxGroupLinkVOExpand;
 * @description: DxGroupLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxGroupLinkVOPluginExpand<V extends DxGroupLinkVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupMemberLinkVOPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.user.expand.entity.DxGroupMemberLinkVOExpand;
 * @description: DxGroupMemberLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxGroupMemberLinkVOPluginExpand<V extends DxGroupMemberLinkVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupVOPluginExpand.java

@@ -6,7 +6,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 * @description: DxGroup-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 public interface DxGroupVOPluginExpand<V extends DxGroupVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxOrganizationGroupLinkVOPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.user.expand.entity.DxOrganizationGroupLinkVOExpand;
 * @description: DxOrganizationGroupLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxOrganizationGroupLinkVOPluginExpand<V extends DxOrganizationGroupLinkVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxOrganizationVOPluginExpand.java

@@ -6,7 +6,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 * @description: DxOrganization-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 public interface DxOrganizationVOPluginExpand<V extends DxOrganizationVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxPostMemberLinkVOPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.user.expand.entity.DxPostMemberLinkVOExpand;
 * @description: DxPostMemberLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxPostMemberLinkVOPluginExpand<V extends DxPostMemberLinkVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxPostVOPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.user.expand.entity.DxPostVOExpand;
 * @description: DxPost-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxPostVOPluginExpand<V extends DxPostVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxPrincipalLinkVOPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalLinkVOExpand;
 * @description: DxPrincipalLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 public interface DxPrincipalLinkVOPluginExpand<V extends DxPrincipalLinkVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxPrincipalVOPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalVOExpand;
 * @description: DxPrincipal-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxPrincipalVOPluginExpand<V extends DxPrincipalVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxUserInfoVOPluginExpand.java

@@ -6,7 +6,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 * @description: DxUserInfo-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxUserInfoVOPluginExpand<V extends DxUserInfoVOPluginExpand> {
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/config/DexBasicServiceAppServiceConfig.java

@@ -10,7 +10,7 @@ import com.yonde.dex.context.core.service.ContextService;
 
 /**
 * @description: dex-bmodel-core-CONFIG
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @Component
 public class DexBasicServiceAppServiceConfig extends AbstractDexAppServiceReplacer {

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/ExtProgramController.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Controller;
 * @description: ExtProgram-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @Api(tags = "ExtProgram管理服务")
 @RequestMapping("/ExtProgram")

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/ExtProgramProjectLinkController.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Controller;
 * @description: ExtProgramProjectLink-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @Api(tags = "ExtProgramProjectLink管理服务")
 @RequestMapping("/ExtProgramProjectLink")

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/expand/ExtDxContextController.java

@@ -19,7 +19,7 @@ import com.yonde.dex.context.core.controller.ContextController;
 * @description: DxContext-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @Api(tags = "DxContext管理服务")
 @RequestMapping("/DxContext")

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/expand/shadow/ExtDxContextControllerShadow.java

@@ -19,7 +19,7 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.controller.DxObjFileLinkControl
 * @description: DxContext-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public class ExtDxContextControllerShadow<V extends DxContextVO, S extends ExtDxContextService<V>> extends ContextController<V, S> implements DxObjFileLinkController<V, S>{
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/shadow/ExtProgramControllerShadow.java

@@ -20,7 +20,7 @@ import com.yonde.dex.baseweb.AbstractBaseController;
 * @description: ExtProgram-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public class ExtProgramControllerShadow<V extends ExtProgramVO, S extends ExtProgramService<V>> implements AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,DxObjFileLinkController<V, S>{
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/shadow/ExtProgramProjectLinkControllerShadow.java

@@ -19,7 +19,7 @@ import com.yonde.dex.baseweb.AbstractBaseController;
 * @description: ExtProgramProjectLink-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public class ExtProgramProjectLinkControllerShadow<V extends ExtProgramProjectLinkVO, S extends ExtProgramProjectLinkService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/repository/ExtProgramProjectLinkRepository.java

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.repository.shadow.ExtProgramProjectLinkRepositor
 * @description: ExtProgramProjectLink-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public interface ExtProgramProjectLinkRepository<P extends ExtProgramProjectLink> extends ExtProgramProjectLinkRepositoryShadow<P> {
 }

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/repository/ExtProgramRepository.java

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.repository.shadow.ExtProgramRepositoryShadow;
 * @description: ExtProgram-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public interface ExtProgramRepository<P extends ExtProgram> extends ExtProgramRepositoryShadow<P> {
 }

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/repository/shadow/ExtProgramProjectLinkRepositoryShadow.java

@@ -9,7 +9,7 @@ import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
 * @description: ExtProgramProjectLink-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @NoRepositoryBean
 public interface ExtProgramProjectLinkRepositoryShadow<P extends ExtProgramProjectLink> extends BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxLinkDataRepository<P> {

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/repository/shadow/ExtProgramRepositoryShadow.java

@@ -2,7 +2,6 @@ package com.yonde.dex.basic.core.repository.shadow;
 
 import com.yonde.dex.basic.entity.po.ExtProgram;
 import org.springframework.data.repository.NoRepositoryBean;
-import com.yonde.dex.logicdelete.plugin.core.repository.DxLogicDeleteRepository;
 import com.yonde.dex.dao.business.repository.BaseRepository;
 import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository;
 import com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository;
@@ -11,10 +10,10 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginR
 * @description: ExtProgram-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @NoRepositoryBean
-public interface ExtProgramRepositoryShadow<P extends ExtProgram> extends DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> {
+public interface ExtProgramRepositoryShadow<P extends ExtProgram> extends DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxSecretCodePluginRepository<P> {
 
     String BEAN_NAME = "extProgramRepository";
 }

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/ExtProgramProjectLinkService.java

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.service.shadow.ExtProgramProjectLinkServiceShado
 * @description: ExtProgramProjectLink-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public interface ExtProgramProjectLinkService<V extends ExtProgramProjectLinkVO> extends ExtProgramProjectLinkServiceShadow<V> {
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/ExtProgramService.java

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.service.shadow.ExtProgramServiceShadow;
 * @description: ExtProgram-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public interface ExtProgramService<V extends ExtProgramVO> extends ExtProgramServiceShadow<V> {
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/expand/ExtDxContextService.java

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.service.expand.shadow.ExtDxContextServiceShadow;
 * @description: DxContext-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface ExtDxContextService<V extends DxContextVO> extends ExtDxContextServiceShadow<V> {
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/expand/shadow/ExtDxContextServiceShadow.java

@@ -4,14 +4,13 @@ import com.yonde.dex.context.common.vo.DxContextVO;
 import com.yonde.dex.basic.feign.expand.ExtDxContextServiceFeign;
 import com.yonde.dex.context.core.service.ContextService;
 import com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService;
-import com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService;
 import com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginService;
 /**
 * @description: DxContext-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
-public interface ExtDxContextServiceShadow<V extends DxContextVO> extends ExtDxContextServiceFeign<V>, ContextService<V> ,ObjFileLinkPluginService<V> ,LogicDeleteService<V> ,SecretCodePluginService<V> {
+public interface ExtDxContextServiceShadow<V extends DxContextVO> extends ExtDxContextServiceFeign<V>, ContextService<V> ,ObjFileLinkPluginService<V> ,SecretCodePluginService<V> {
 
 }

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/impl/ExtProgramProjectLinkServiceImpl.java

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 * @description: ExtProgramProjectLink-ServiceImpl
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @Slf4j
 @Service(ExtProgramProjectLinkServiceImpl.BEAN_NAME)

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/impl/ExtProgramServiceImpl.java

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 * @description: ExtProgram-ServiceImpl
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @Slf4j
 @Service(ExtProgramServiceImpl.BEAN_NAME)

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/impl/expand/ExtDxContextServiceImpl.java

@@ -18,7 +18,7 @@ import com.yonde.dex.context.core.service.impl.ContextServiceImpl;
 * @description: DxContext-ServiceImpl
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @Slf4j
 @Service(ContextServiceImpl.BEAN_NAME)

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/shadow/ExtProgramProjectLinkServiceShadow.java

@@ -9,7 +9,7 @@ import com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService;
 * @description: ExtProgramProjectLink-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public interface ExtProgramProjectLinkServiceShadow<V extends ExtProgramProjectLinkVO> extends ExtProgramProjectLinkServiceFeign<V>, BaseIdEntityService<V> ,LogicDeleteService<V> ,DxLinkDataService<V> {
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/shadow/ExtProgramServiceShadow.java

@@ -5,14 +5,13 @@ import com.yonde.dex.basic.feign.ExtProgramServiceFeign;
 import com.yonde.dex.dao.service.BaseIdEntityService;
 import com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService;
 import com.yonde.dex.lcycle.plugin.core.service.LifecycleBaseService;
-import com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService;
 import com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginService;
 /**
 * @description: ExtProgram-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
-public interface ExtProgramServiceShadow<V extends ExtProgramVO> extends ExtProgramServiceFeign<V>, ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,LogicDeleteService<V> ,SecretCodePluginService<V> {
+public interface ExtProgramServiceShadow<V extends ExtProgramVO> extends ExtProgramServiceFeign<V>, ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,SecretCodePluginService<V> {
 
 }

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/basic/entity/po/ExtProgram.java

@@ -32,21 +32,19 @@ import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
 import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
 import com.yonde.dex.dao.entity.base.IdOnlyEntity;
-import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
-import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
 
 /**
 * @description: ExtProgram-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
 @Table(name = "EXT_PROGRAM")
-public class ExtProgram extends IdOnlyEntity implements DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxLogicDeleteHolder ,DxSecretHolder{
+public class ExtProgram extends IdOnlyEntity implements DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxSecretHolder{
 
     /**
     * 扩展PO属性
@@ -71,12 +69,6 @@ public class ExtProgram extends IdOnlyEntity implements DxObjFileLinkHolder ,DxL
     */
     @DexEmbedded()
     @Embedded()
-    private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
-    /**
-    * 扩展PO属性
-    */
-    @DexEmbedded()
-    @Embedded()
     private DxSecretEmbeddable dxSecretEmbeddable;
     /**
     * 外协项目预算总额

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/basic/entity/po/ExtProgramProjectLink.java

@@ -35,7 +35,7 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
 * @description: ExtProgramProjectLink-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/basic/expand/entity/DxViewExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxView-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/basic/expand/plugin/DxViewPluginExpand.java

@@ -4,7 +4,7 @@ import com.yonde.dex.basic.expand.entity.DxViewExpand;
 * @description: DxView-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxViewPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextEnterpriseExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.context.expand.entity.DxContextExpand;
 * @description: DxContextEnterprise-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextExpand.java

@@ -14,13 +14,12 @@ import javax.persistence.Column;
 import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
-import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
 
 /**
 * @description: DxContext-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable
@@ -39,12 +38,6 @@ public class DxContextExpand implements Serializable{
     */
     @DexEmbedded()
     @Embedded()
-    private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
-    /**
-    * 扩展PO属性
-    */
-    @DexEmbedded()
-    @Embedded()
     private DxSecretEmbeddable dxSecretEmbeddable;
     /**
     * 外协项目预算总额

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextLibraryExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.context.expand.entity.DxContextExpand;
 * @description: DxContextLibrary-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextProductionExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.context.expand.entity.DxContextExpand;
 * @description: DxContextProduction-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextProjectExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.context.expand.entity.DxContextExpand;
 * @description: DxContextProject-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextTeamExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxContextTeam-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextTeamMemberExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxContextTeamMember-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextEnterprisePluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 * @description: DxContextEnterprise-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxContextEnterprisePluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextLibraryPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 * @description: DxContextLibrary-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxContextLibraryPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextPluginExpand.java

@@ -4,36 +4,26 @@ import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
-import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
-import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
 /**
 * @description: DxContext-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
-public interface DxContextPluginExpand extends DxObjFileLinkHolder ,DxLogicDeleteHolder ,DxSecretHolder{
+public interface DxContextPluginExpand extends DxObjFileLinkHolder ,DxSecretHolder{
 
     DxContextExpand getDxContextExpand();
 
     void setDxContextExpand(DxContextExpand dxContextExpand);
 
-            @Override
-    default void setDxLogicDeleteEmbeddable(DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable) {
-        getDxContextExpand().setDxLogicDeleteEmbeddable(dxLogicDeleteEmbeddable);
-    }
 //            @Override
-//    default void setDxObjFileLinkEmbeddable(DxObjFileLinkEmbeddable dxObjFileLinkEmbeddable) {
-//        getDxContextExpand().setDxObjFileLinkEmbeddable(dxObjFileLinkEmbeddable);
-//    }
-            @Override
-    default DxLogicDeleteEmbeddable getDxLogicDeleteEmbeddable() {
-        return getDxContextExpand().getDxLogicDeleteEmbeddable();
+    default void setDxObjFileLinkEmbeddable(DxObjFileLinkEmbeddable dxObjFileLinkEmbeddable) {
+        getDxContextExpand().setDxObjFileLinkEmbeddable(dxObjFileLinkEmbeddable);
     }
 //            @Override
-//    default DxObjFileLinkEmbeddable getDxObjFileLinkEmbeddable() {
-//        return getDxContextExpand().getDxObjFileLinkEmbeddable();
-//    }
+    default DxObjFileLinkEmbeddable getDxObjFileLinkEmbeddable() {
+        return getDxContextExpand().getDxObjFileLinkEmbeddable();
+    }
             @Override
     default void setDxSecretEmbeddable(DxSecretEmbeddable dxSecretEmbeddable) {
         getDxContextExpand().setDxSecretEmbeddable(dxSecretEmbeddable);

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextProductionPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 * @description: DxContextProduction-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxContextProductionPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextProjectPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 * @description: DxContextProject-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxContextProjectPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextTeamMemberPluginExpand.java

@@ -4,7 +4,7 @@ import com.yonde.dex.context.expand.entity.DxContextTeamMemberExpand;
 * @description: DxContextTeamMember-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 public interface DxContextTeamMemberPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextTeamPluginExpand.java

@@ -4,7 +4,7 @@ import com.yonde.dex.context.expand.entity.DxContextTeamExpand;
 * @description: DxContextTeam-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 public interface DxContextTeamPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxGroupExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalExpand;
 * @description: DxGroup-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:02
+* @date: 2024-8-30 14:05:31
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxGroupLinkExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxGroupLink-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxGroupMemberLinkExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxGroupMemberLink-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxOrganizationExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalExpand;
 * @description: DxOrganization-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxOrganizationGroupLinkExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxOrganizationGroupLink-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxPostExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxPost-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxPostMemberLinkExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxPostMemberLink-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxPrincipalExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxPrincipal-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxPrincipalLinkExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxPrincipalLink-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxUserInfoExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalExpand;
 * @description: DxUserInfo-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupLinkPluginExpand.java

@@ -4,7 +4,7 @@ import com.yonde.dex.user.expand.entity.DxGroupLinkExpand;
 * @description: DxGroupLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxGroupLinkPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupMemberLinkPluginExpand.java

@@ -4,7 +4,7 @@ import com.yonde.dex.user.expand.entity.DxGroupMemberLinkExpand;
 * @description: DxGroupMemberLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxGroupMemberLinkPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalPluginExpand;
 * @description: DxGroup-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:02
+* @date: 2024-8-30 14:05:31
 **/
 public interface DxGroupPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxOrganizationGroupLinkPluginExpand.java

@@ -4,7 +4,7 @@ import com.yonde.dex.user.expand.entity.DxOrganizationGroupLinkExpand;
 * @description: DxOrganizationGroupLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxOrganizationGroupLinkPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxOrganizationPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalPluginExpand;
 * @description: DxOrganization-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 public interface DxOrganizationPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxPostMemberLinkPluginExpand.java

@@ -4,7 +4,7 @@ import com.yonde.dex.user.expand.entity.DxPostMemberLinkExpand;
 * @description: DxPostMemberLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxPostMemberLinkPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxPostPluginExpand.java

@@ -4,7 +4,7 @@ import com.yonde.dex.user.expand.entity.DxPostExpand;
 * @description: DxPost-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxPostPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxPrincipalLinkPluginExpand.java

@@ -4,7 +4,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalLinkExpand;
 * @description: DxPrincipalLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:31
 **/
 public interface DxPrincipalLinkPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxPrincipalPluginExpand.java

@@ -4,7 +4,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalExpand;
 * @description: DxPrincipal-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxPrincipalPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxUserInfoPluginExpand.java

@@ -5,7 +5,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalPluginExpand;
 * @description: DxUserInfo-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 public interface DxUserInfoPluginExpand {
 

dex-basic-service-expand-feign/pom.xml

@@ -9,7 +9,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dex-basic-service-expand-feign</artifactId>
-    <version>4.1-20240826-RELEASE</version>
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -67,7 +66,7 @@
 <!--            <dependency>-->
 <!--                <groupId>com.yonde.dcs</groupId>-->
 <!--                <artifactId>dcs-doc-expand-feign</artifactId>-->
-<!--                <version>4.1-20240826-RELEASE</version>-->
+<!--                    <version>4.1-20240826-RELEASE</version>-->
 <!--            </dependency>-->
     </dependencies>
 

dex-basic-service-expand-feign/src/main/java/com/yonde/dex/basic/feign/ExtProgramProjectLinkServiceFeign.java

@@ -10,7 +10,7 @@ import com.yonde.dex.basic.feign.shadow.ExtProgramProjectLinkServiceFeignShadow;
 * @description: ExtProgramProjectLink-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @Api(tags = "ExtProgramProjectLink-FEIGN")
 @FeignClient(value = "${dex.feign.DEX-BASIC-SERVICE}", path = "/ExtProgramProjectLink")

dex-basic-service-expand-feign/src/main/java/com/yonde/dex/basic/feign/ExtProgramServiceFeign.java

@@ -10,7 +10,7 @@ import com.yonde.dex.basic.feign.shadow.ExtProgramServiceFeignShadow;
 * @description: ExtProgram-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 @Api(tags = "ExtProgram-FEIGN")
 @FeignClient(value = "${dex.feign.DEX-BASIC-SERVICE}", path = "/ExtProgram")

dex-basic-service-expand-feign/src/main/java/com/yonde/dex/basic/feign/expand/ExtDxContextServiceFeign.java

@@ -12,7 +12,7 @@ import com.yonde.dex.dao.service.adapter.DexExpandBeanReplace;
 * @description: DxContext-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
 @Api(tags = "DxContext-FEIGN")
 @FeignClient(value = "${dex.feign.DEX-BASIC-SERVICE}", path = "/DxContext")

dex-basic-service-expand-feign/src/main/java/com/yonde/dex/basic/feign/expand/shadow/ExtDxContextServiceFeignShadow.java

@@ -6,15 +6,14 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.secretcode.plugin.feign.SecretCodeFeign;
 import com.yonde.dex.context.feign.ContextServiceFeign;
-import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign;
 
 /**
 * @description: DxContext-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:03
+* @date: 2024-8-30 14:05:32
 **/
-public interface ExtDxContextServiceFeignShadow<V extends DxContextVO> extends ContextServiceFeign<V> ,LogicDeleteFeign<V> ,SecretCodeFeign<V> {
+public interface ExtDxContextServiceFeignShadow<V extends DxContextVO> extends ContextServiceFeign<V> ,SecretCodeFeign<V> {
 
     String BEAN_NAME = "contextServiceFeign";
 

dex-basic-service-expand-feign/src/main/java/com/yonde/dex/basic/feign/shadow/ExtProgramProjectLinkServiceFeignShadow.java

@@ -12,7 +12,7 @@ import com.yonde.dex.linkdata.plugin.feign.DxLinkDataFeign;
 * @description: ExtProgramProjectLink-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
 public interface ExtProgramProjectLinkServiceFeignShadow<V extends ExtProgramProjectLinkVO> extends BaseFeign<V> ,LogicDeleteFeign<V> ,DxLinkDataFeign<V> {
 

dex-basic-service-expand-feign/src/main/java/com/yonde/dex/basic/feign/shadow/ExtProgramServiceFeignShadow.java

@@ -7,15 +7,14 @@ import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.lcycle.plugin.feign.BaseLifecycleManageFeign;
 import com.yonde.dex.dao.service.remotes.BaseFeign;
 import com.yonde.dex.secretcode.plugin.feign.SecretCodeFeign;
-import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign;
 
 /**
 * @description: ExtProgram-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-28 17:09:04
+* @date: 2024-8-30 14:05:32
 **/
-public interface ExtProgramServiceFeignShadow<V extends ExtProgramVO> extends BaseLifecycleManageFeign<V> ,BaseFeign<V> ,LogicDeleteFeign<V> ,SecretCodeFeign<V> {
+public interface ExtProgramServiceFeignShadow<V extends ExtProgramVO> extends BaseLifecycleManageFeign<V> ,BaseFeign<V> ,SecretCodeFeign<V> {
 
     String BEAN_NAME = "extProgramServiceFeign";