init

.gitignore

+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+cmake-build-release/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+*.iml
+.idea/
+**/target/**
+*.gitkeep
+.mvn/
\ No newline at end of file

.idea/.gitignore

-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+cmake-build-release/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+*.iml
+.idea/
+**/target/**
+*.gitkeep
+.mvn/
\ No newline at end of file

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

@@ -8,6 +8,7 @@ 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;

dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/common/vo/ExtProgramVO.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 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.annotation.DexEmbedded;
+import com.yonde.dex.basedata.entity.annotation.ReferenceProperty;
+import com.yonde.dex.basedata.entity.annotation.RelationProperty;
+import com.yonde.dex.basedata.entity.annotation.VersionProperty;
 import com.yonde.dex.basedata.entity.data.VersionRelationType;
 import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
-import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
+import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
+import com.yonde.dex.basedata.entity.vo.IdVO;
+import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
-import com.yonde.dex.basic.common.vo.ExtProgramProjectLinkVO;
-import com.yonde.dex.basic.common.vo.DxUserInfoVO;
-import com.yonde.dex.basedata.entity.users.DxUserVO;
-import com.yonde.dex.basic.common.vo.DxOrganizationVO;
-import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
 import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
+import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
 import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
-import com.yonde.dex.basedata.entity.vo.IdVO;
+import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
-import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
+import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
+import com.yonde.dex.user.common.vo.DxOrganizationVO;
+import com.yonde.dex.user.common.vo.DxUserInfoVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
 * @description: ExtProgram-VO

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

 package com.yonde.dex.context.expand.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
+import com.yonde.dex.basedata.entity.annotation.ReferenceProperty;
+import com.yonde.dex.basedata.entity.annotation.RelationProperty;
+import com.yonde.dex.basedata.entity.annotation.VersionProperty;
+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;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+
 import java.io.Serializable;
-import java.math.BigInteger;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import java.util.Date;
-import com.yonde.dex.basedata.entity.annotation.*;
-import com.yonde.dex.basedata.entity.data.VersionRelationType;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.TypeReference;
 import java.util.List;
-import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
-import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
-import com.yonde.dex.basic.common.vo.ExtProgramProjectLinkVO;
-import com.yonde.dex.basic.common.vo.DxUserInfoVO;
-import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
-import com.yonde.dex.basic.common.vo.DxOrganizationVO;
 
 /**
 * @description: DxContext-VOExpand扩展实体

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

 package com.yonde.dex.context.expand.plugin;
+
 import com.yonde.dex.context.expand.entity.DxContextExpand;
 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;
+import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
+import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
+import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
 /**
 * @description: DxContext-扩展PO插件接口
 * @author: dexadmin
@@ -22,18 +22,12 @@ public interface DxContextPluginExpand extends DxObjFileLinkHolder ,DxLogicDelet
     default void setDxLogicDeleteEmbeddable(DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable) {
         getDxContextExpand().setDxLogicDeleteEmbeddable(dxLogicDeleteEmbeddable);
     }
-            @Override
-    default void setDxObjFileLinkEmbeddable(DxObjFileLinkEmbeddable dxObjFileLinkEmbeddable) {
-        getDxContextExpand().setDxObjFileLinkEmbeddable(dxObjFileLinkEmbeddable);
-    }
+
     @Override
     default DxLogicDeleteEmbeddable getDxLogicDeleteEmbeddable() {
         return getDxContextExpand().getDxLogicDeleteEmbeddable();
     }
-            @Override
-    default DxObjFileLinkEmbeddable getDxObjFileLinkEmbeddable() {
-        return getDxContextExpand().getDxObjFileLinkEmbeddable();
-    }
+
     @Override
     default void setDxSecretEmbeddable(DxSecretEmbeddable dxSecretEmbeddable) {
         getDxContextExpand().setDxSecretEmbeddable(dxSecretEmbeddable);