Merge remote-tracking branch 'origin/master'

.idea/encodings.xml

@@ -5,13 +5,9 @@
     <file url="file://$PROJECT_DIR$/dex-basic-service-expand-build-lib/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dex-basic-service-expand-build-thirdLib/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dex-basic-service-expand-build-thirdLib/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/dex-basic-service-expand-common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dex-basic-service-expand-common/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/dex-basic-service-expand-core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dex-basic-service-expand-core/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/dex-basic-service-expand-entity/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dex-basic-service-expand-entity/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/dex-basic-service-expand-feign/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dex-basic-service-expand-feign/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dex-basic-service-expand-server/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dex-basic-service-expand-server/src/main/resources" charset="UTF-8" />

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

@@ -43,7 +43,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
 * @description: ExtProgramProjectLink-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramProjectLinkVO.class)
 @EqualsAndHashCode(callSuper = true)

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

@@ -47,7 +47,7 @@ import com.yonde.dex.user.common.vo.DxOrganizationVO;
 * @description: ExtProgram-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramVO.class)
 @EqualsAndHashCode(callSuper = true)

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

@@ -42,7 +42,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
 * @description: ExtProjectContractLink-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProjectContractLinkVO.class)
 @EqualsAndHashCode(callSuper = true)

dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/common/vo/ExtProjectTopicLinkVO.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.dcs.plan.common.vo.ExtTopicPreparationVO;
+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.DxContextProjectVO;
+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.basedata.entity.vo.DxIdVOEmbeddable;
+import com.yonde.dex.basedata.entity.vo.IdVO;
+import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
+import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtProjectTopicLink-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProjectTopicLinkVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+public class ExtProjectTopicLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<DxContextProjectVO, ExtTopicPreparationVO>{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 扩展VO属性
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxLinkDataVOEmbeddable<DxContextProjectVO, ExtTopicPreparationVO> dxLinkDataEmbeddable;
+
+}
+
+

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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 @EqualsAndHashCode
 @Data

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

@@ -11,7 +11,7 @@ import com.yonde.dex.basic.expand.entity.DxViewVOExpand;
 * @description: DxView-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @EqualsAndHashCode
 @Data

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

@@ -16,19 +16,21 @@ import cn.hutool.core.lang.TypeReference;
 import java.util.List;
 import com.yonde.dex.context.expand.plugin.DxContextProjectVOPluginExpand;
 import com.yonde.dex.basic.common.vo.ExtProjectContractLinkVO;
+import com.yonde.dex.basic.common.vo.ExtProjectTopicLinkVO;
 import com.yonde.dex.context.expand.entity.DxContextVOExpand;
 
 /**
 * @description: DxContextProject-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @EqualsAndHashCode
 @Data
 @ToString(callSuper = true)
 public class DxContextProjectVOExpand<V extends DxContextProjectVOPluginExpand> implements Serializable{
     public static final String EXT_PROJECT_CONTRACT_LINKS_PROP_NAME = "extProjectContractLinks";
+    public static final String EXT_PROJECT_TOPIC_LINKS_PROP_NAME = "extProjectTopicLinks";
 
     /**
     * 项目收入合同link集合
@@ -37,6 +39,13 @@ public class DxContextProjectVOExpand<V extends DxContextProjectVOPluginExpand>
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
     private List<ExtProjectContractLinkVO> extProjectContractLinks;
 
+    /**
+    * ExtProjectTopicLink集合
+    */
+    @RelationProperty(refProperty = "source")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtProjectTopicLinkVO> extProjectTopicLinks;
+
 }
 
 

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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @EqualsAndHashCode
 @Data

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

@@ -25,7 +25,7 @@ import com.yonde.dex.user.common.vo.DxOrganizationVO;
 * @description: DxContext-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-28 10:59:10
 **/
 @EqualsAndHashCode
 @Data
@@ -34,6 +34,8 @@ public class DxContextVOExpand<V extends DxContextVOPluginExpand> implements Ser
     public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
     public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
     public static final String BUDGET_AMOUNT_PROP_NAME = "budgetAmount";
+    public static final String CONTRACT_CODE_PROP_NAME = "contractCode";
+    public static final String CONTRACT_CODE_EXPLANATION_PROP_NAME = "contractCodeExplanation";
     public static final String CUSTOM_UNIT_PROP_NAME = "customUnit";
     public static final String END_TIME_PROP_NAME = "endTime";
     public static final String EXT_PROGRAM_PROJECT_LINKS_PROP_NAME = "extProgramProjectLinks";
@@ -72,6 +74,16 @@ public class DxContextVOExpand<V extends DxContextVOPluginExpand> implements Ser
     */
     private Integer budgetAmount;
 
+    /**
+    * 合同编码
+    */
+    private String contractCode;
+
+    /**
+    * 合同编码说明
+    */
+    private String contractCodeExplanation;
+
     /**
     * 客户单位
     */

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

@@ -12,7 +12,7 @@ import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 * @description: DxContextEnterprise-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxContextEnterpriseVOPluginExpand<V extends DxContextEnterpriseVOPluginExpand> {
 

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

@@ -12,7 +12,7 @@ import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 * @description: DxContextLibrary-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxContextLibraryVOPluginExpand<V extends DxContextLibraryVOPluginExpand> {
 

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

@@ -12,7 +12,7 @@ import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 * @description: DxContextProduction-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxContextProductionVOPluginExpand<V extends DxContextProductionVOPluginExpand> {
 

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

@@ -9,11 +9,12 @@ import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextProjectVOExpand;
 import com.yonde.dex.basic.common.vo.ExtProjectContractLinkVO;
 import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
+import com.yonde.dex.basic.common.vo.ExtProjectTopicLinkVO;
 /**
 * @description: DxContextProject-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxContextProjectVOPluginExpand<V extends DxContextProjectVOPluginExpand> {
 
@@ -27,4 +28,10 @@ public interface DxContextProjectVOPluginExpand<V extends DxContextProjectVOPlug
     default void setExtProjectContractLinks(List<ExtProjectContractLinkVO> extProjectContractLinks) {
         DxExpandUtils.getNotNullObject(this::getDxContextProjectExpand,this::setDxContextProjectExpand,new DxContextProjectVOExpand<>()).setExtProjectContractLinks(extProjectContractLinks);
     }
+    default List<ExtProjectTopicLinkVO> getExtProjectTopicLinks() {
+        return DxExpandUtils.getNotNullObject(this::getDxContextProjectExpand,this::setDxContextProjectExpand,new DxContextProjectVOExpand<>()).getExtProjectTopicLinks();
+    }
+    default void setExtProjectTopicLinks(List<ExtProjectTopicLinkVO> extProjectTopicLinks) {
+        DxExpandUtils.getNotNullObject(this::getDxContextProjectExpand,this::setDxContextProjectExpand,new DxContextProjectVOExpand<>()).setExtProjectTopicLinks(extProjectTopicLinks);
+    }
 }

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

@@ -11,7 +11,7 @@ import com.yonde.dex.context.expand.entity.DxContextTeamMemberVOExpand;
 * @description: DxContextTeamMember-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxContextTeamMemberVOPluginExpand<V extends DxContextTeamMemberVOPluginExpand> {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.context.expand.entity.DxContextTeamVOExpand;
 * @description: DxContextTeam-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxContextTeamVOPluginExpand<V extends DxContextTeamVOPluginExpand> {
 

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

@@ -19,7 +19,7 @@ import com.yonde.dex.user.common.vo.DxUserInfoVO;
 * @description: DxContext-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-28 10:59:10
 **/
 public interface DxContextVOPluginExpand<V extends DxContextVOPluginExpand> extends DxObjFileLinkVOHolder ,DxSecretVOHolder{
 
@@ -27,6 +27,9 @@ public interface DxContextVOPluginExpand<V extends DxContextVOPluginExpand> exte
 
     void setDxContextExpand(DxContextVOExpand<V> dxContextExpand);
 
+    default String getContractCode() {
+        return DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).getContractCode();
+    }
     default Integer getBudgetAmount() {
         return DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).getBudgetAmount();
     }
@@ -39,6 +42,9 @@ public interface DxContextVOPluginExpand<V extends DxContextVOPluginExpand> exte
     default void setCustomUnit(String customUnit) {
         DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).setCustomUnit(customUnit);
     }
+    default void setContractCodeExplanation(String contractCodeExplanation) {
+        DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).setContractCodeExplanation(contractCodeExplanation);
+    }
     default void setBudgetAmount(Integer budgetAmount) {
         DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).setBudgetAmount(budgetAmount);
     }
@@ -61,6 +67,9 @@ public interface DxContextVOPluginExpand<V extends DxContextVOPluginExpand> exte
     default void setEndTime(LocalDateTime endTime) {
         DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).setEndTime(endTime);
     }
+    default void setContractCode(String contractCode) {
+        DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).setContractCode(contractCode);
+    }
     default DxUserInfoVO getManager() {
         return DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).getManager();
     }
@@ -147,6 +156,9 @@ public interface DxContextVOPluginExpand<V extends DxContextVOPluginExpand> exte
     default String getProType() {
         return DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).getProType();
     }
+    default String getContractCodeExplanation() {
+        return DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).getContractCodeExplanation();
+    }
     default LocalDateTime getEndTime() {
         return DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextVOExpand<>()).getEndTime();
     }

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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @EqualsAndHashCode
 @Data

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

@@ -11,7 +11,7 @@ import com.yonde.dex.user.expand.entity.DxGroupLinkVOExpand;
 * @description: DxGroupLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxGroupLinkVOPluginExpand<V extends DxGroupLinkVOPluginExpand> {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.user.expand.entity.DxGroupMemberLinkVOExpand;
 * @description: DxGroupMemberLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxGroupMemberLinkVOPluginExpand<V extends DxGroupMemberLinkVOPluginExpand> {
 

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

@@ -12,7 +12,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 * @description: DxGroup-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxGroupVOPluginExpand<V extends DxGroupVOPluginExpand> {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.user.expand.entity.DxOrganizationGroupLinkVOExpand;
 * @description: DxOrganizationGroupLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxOrganizationGroupLinkVOPluginExpand<V extends DxOrganizationGroupLinkVOPluginExpand> {
 

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

@@ -12,7 +12,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 * @description: DxOrganization-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxOrganizationVOPluginExpand<V extends DxOrganizationVOPluginExpand> {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.user.expand.entity.DxPostMemberLinkVOExpand;
 * @description: DxPostMemberLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxPostMemberLinkVOPluginExpand<V extends DxPostMemberLinkVOPluginExpand> {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.user.expand.entity.DxPostVOExpand;
 * @description: DxPost-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxPostVOPluginExpand<V extends DxPostVOPluginExpand> {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalLinkVOExpand;
 * @description: DxPrincipalLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxPrincipalLinkVOPluginExpand<V extends DxPrincipalLinkVOPluginExpand> {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalVOExpand;
 * @description: DxPrincipal-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxPrincipalVOPluginExpand<V extends DxPrincipalVOPluginExpand> {
 

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

@@ -12,7 +12,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 * @description: DxUserInfo-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxUserInfoVOPluginExpand<V extends DxUserInfoVOPluginExpand> {
 

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

@@ -12,7 +12,7 @@ import com.yonde.dex.context.core.service.ContextProjectService;
 
 /**
 * @description: dex-bmodel-core-CONFIG
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @Component
 public class DexBasicServiceAppServiceConfig extends AbstractDexAppServiceReplacer {

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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @Api(tags = "ExtProgramProjectLink管理服务")
 @RequestMapping("/ExtProgramProjectLink")

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

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Controller;
 * @description: ExtProjectContractLink-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @Api(tags = "ExtProjectContractLink管理服务")
 @RequestMapping("/ExtProjectContractLink")

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

+package com.yonde.dex.basic.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dex.basic.common.vo.ExtProjectTopicLinkVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dex.basic.core.service.ExtProjectTopicLinkService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dex.basic.core.controller.shadow.ExtProjectTopicLinkControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtProjectTopicLink-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+@Api(tags = "ExtProjectTopicLink管理服务")
+@RequestMapping("/ExtProjectTopicLink")
+@ResponseBody()
+@Controller(ExtProjectTopicLinkController.BEAN_NAME)
+public class ExtProjectTopicLinkController<V extends ExtProjectTopicLinkVO, S extends ExtProjectTopicLinkService<V>> extends ExtProjectTopicLinkControllerShadow<V, S> {
+
+
+}
+
+

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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 @Api(tags = "DxContext管理服务")
 @RequestMapping("/DxContext")

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

@@ -19,7 +19,7 @@ import com.yonde.dex.context.core.controller.ContextProjectController;
 * @description: DxContextProject-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @Api(tags = "DxContextProject管理服务")
 @RequestMapping("/DxContextProject")

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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 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/expand/shadow/ExtDxContextProjectControllerShadow.java

@@ -19,7 +19,7 @@ import com.yonde.dex.context.core.controller.ContextController;
 * @description: DxContextProject-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public class ExtDxContextProjectControllerShadow<V extends DxContextProjectVO, S extends ExtDxContextProjectService<V>> extends ContextProjectController<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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 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/controller/shadow/ExtProjectContractLinkControllerShadow.java

@@ -19,7 +19,7 @@ import com.yonde.dex.baseweb.AbstractBaseController;
 * @description: ExtProjectContractLink-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 public class ExtProjectContractLinkControllerShadow<V extends ExtProjectContractLinkVO, S extends ExtProjectContractLinkService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
 

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

+package com.yonde.dex.basic.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dex.basic.common.vo.ExtProjectTopicLinkVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dex.basic.core.service.ExtProjectTopicLinkService;
+import com.yonde.dex.basic.core.service.impl.ExtProjectTopicLinkServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtProjectTopicLink-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+public class ExtProjectTopicLinkControllerShadow<V extends ExtProjectTopicLinkVO, S extends ExtProjectTopicLinkService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
+
+    public static final String BEAN_NAME = "extProjectTopicLinkController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtProjectTopicLinkServiceImpl.BEAN_NAME)
+    private ExtProjectTopicLinkService<V> extProjectTopicLinkService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extProjectTopicLinkService;
+    }
+}
+
+

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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 public interface ExtProgramRepository<P extends ExtProgram> extends ExtProgramRepositoryShadow<P> {
 }

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

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.repository.shadow.ExtProjectContractLinkReposito
 * @description: ExtProjectContractLink-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 public interface ExtProjectContractLinkRepository<P extends ExtProjectContractLink> extends ExtProjectContractLinkRepositoryShadow<P> {
 }

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

+package com.yonde.dex.basic.core.repository;
+
+import com.yonde.dex.basic.entity.po.ExtProjectTopicLink;
+import com.yonde.dex.basic.core.repository.shadow.ExtProjectTopicLinkRepositoryShadow;
+/**
+* @description: ExtProjectTopicLink-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+public interface ExtProjectTopicLinkRepository<P extends ExtProjectTopicLink> extends ExtProjectTopicLinkRepositoryShadow<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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @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

@@ -10,7 +10,7 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginR
 * @description: ExtProgram-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @NoRepositoryBean
 public interface ExtProgramRepositoryShadow<P extends ExtProgram> extends DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxSecretCodePluginRepository<P> {

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

@@ -8,7 +8,7 @@ import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
 * @description: ExtProjectContractLink-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @NoRepositoryBean
 public interface ExtProjectContractLinkRepositoryShadow<P extends ExtProjectContractLink> extends BaseRepository<P> ,DxLinkDataRepository<P> {

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

+package com.yonde.dex.basic.core.repository.shadow;
+
+import com.yonde.dex.basic.entity.po.ExtProjectTopicLink;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
+/**
+* @description: ExtProjectTopicLink-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+@NoRepositoryBean
+public interface ExtProjectTopicLinkRepositoryShadow<P extends ExtProjectTopicLink> extends BaseRepository<P> ,DxLinkDataRepository<P> {
+
+    String BEAN_NAME = "extProjectTopicLinkRepository";
+}

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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 public interface ExtProgramProjectLinkService<V extends ExtProgramProjectLinkVO> extends ExtProgramProjectLinkServiceShadow<V> {
 

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

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.service.shadow.ExtProjectContractLinkServiceShad
 * @description: ExtProjectContractLink-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 public interface ExtProjectContractLinkService<V extends ExtProjectContractLinkVO> extends ExtProjectContractLinkServiceShadow<V> {
 

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

+package com.yonde.dex.basic.core.service;
+
+import com.yonde.dex.basic.common.vo.ExtProjectTopicLinkVO;
+import com.yonde.dex.basic.core.service.shadow.ExtProjectTopicLinkServiceShadow;
+/**
+* @description: ExtProjectTopicLink-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+public interface ExtProjectTopicLinkService<V extends ExtProjectTopicLinkVO> extends ExtProjectTopicLinkServiceShadow<V> {
+
+}

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

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.service.expand.shadow.ExtDxContextProjectService
 * @description: DxContextProject-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface ExtDxContextProjectService<V extends DxContextProjectVO> extends ExtDxContextProjectServiceShadow<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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 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/ExtDxContextProjectServiceShadow.java

@@ -8,7 +8,7 @@ import com.yonde.dex.context.core.service.ContextProjectService;
 * @description: DxContextProject-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface ExtDxContextProjectServiceShadow<V extends DxContextProjectVO> extends ExtDxContextProjectServiceFeign<V>, ContextService<V> ,ContextProjectService<V> {
 

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

@@ -9,7 +9,7 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginServic
 * @description: DxContext-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @Slf4j
 @Service(ExtProgramProjectLinkServiceImpl.BEAN_NAME)

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

@@ -75,7 +75,7 @@ public class ExtProgramServiceImpl<V extends ExtProgramVO> implements ExtProgram
 //                    DxContextVO target = (DxContextVO) contextProjectServiceShadow.get(targetId);
 //                    target.setChildren(children);
 //                    linkVO.setTarget(target);
-                    linkVO.getTarget().setChildren(children);
+//                    linkVO.getTarget().setChildren(children);
                 }
                 v.setExtProgramProjectLinks(content);
             }

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

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 * @description: ExtProjectContractLink-ServiceImpl
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @Slf4j
 @Service(ExtProjectContractLinkServiceImpl.BEAN_NAME)

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

+package com.yonde.dex.basic.core.service.impl;
+
+import org.springframework.stereotype.Service;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import com.yonde.dex.basic.common.vo.ExtProjectTopicLinkVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dex.basic.core.service.ExtProjectTopicLinkService;
+import com.yonde.dex.basic.core.repository.ExtProjectTopicLinkRepository;
+import com.yonde.dex.basic.entity.po.ExtProjectTopicLink;
+import javax.annotation.Resource;
+
+/**
+* @description: ExtProjectTopicLink-ServiceImpl
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+@Slf4j
+@Service(ExtProjectTopicLinkServiceImpl.BEAN_NAME)
+public class ExtProjectTopicLinkServiceImpl<V extends ExtProjectTopicLinkVO> implements ExtProjectTopicLinkService<V>{
+
+
+    public static final String BEAN_NAME = "extProjectTopicLinkServiceImpl";
+
+    @Autowired
+    ExtProjectTopicLinkRepository<ExtProjectTopicLink> extProjectTopicLinkRepository;
+
+}
+
+

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

@@ -19,7 +19,7 @@ import com.yonde.dex.context.core.service.impl.ContextServiceImpl;
 * @description: DxContextProject-ServiceImpl
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @Slf4j
 @Service(ContextProjectServiceImpl.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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 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

@@ -10,7 +10,7 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginServic
 * @description: ExtProgram-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface ExtProgramServiceShadow<V extends ExtProgramVO> extends ExtProgramServiceFeign<V>, ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,SecretCodePluginService<V> {
 

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

@@ -8,7 +8,7 @@ import com.yonde.dex.dao.service.BaseIdEntityService;
 * @description: ExtProjectContractLink-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 public interface ExtProjectContractLinkServiceShadow<V extends ExtProjectContractLinkVO> extends ExtProjectContractLinkServiceFeign<V>, BaseIdEntityService<V> ,DxLinkDataService<V> {
 

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

+package com.yonde.dex.basic.core.service.shadow;
+
+import com.yonde.dex.basic.common.vo.ExtProjectTopicLinkVO;
+import com.yonde.dex.basic.feign.ExtProjectTopicLinkServiceFeign;
+import com.yonde.dex.linkdata.plugin.core.service.DxLinkDataService;
+import com.yonde.dex.dao.service.BaseIdEntityService;
+/**
+* @description: ExtProjectTopicLink-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+public interface ExtProjectTopicLinkServiceShadow<V extends ExtProjectTopicLinkVO> extends ExtProjectTopicLinkServiceFeign<V>, BaseIdEntityService<V> ,DxLinkDataService<V> {
+
+}

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

@@ -37,7 +37,7 @@ import com.yonde.dex.dao.entity.base.IdOnlyEntity;
 * @description: ExtProgram-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)

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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)

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

@@ -33,7 +33,7 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
 * @description: ExtProjectContractLink-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)

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

+package com.yonde.dex.basic.entity.po;
+
+import org.springframework.data.annotation.CreatedBy;
+import javax.persistence.UniqueConstraint;
+import java.util.Date;
+import java.time.LocalDateTime;
+import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.LastModifiedDate;
+import com.yonde.dex.dao.entity.base.IdEntity;
+import org.springframework.data.annotation.LastModifiedBy;
+import javax.persistence.Column;
+import org.springframework.data.annotation.CreatedDate;
+import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
+import lombok.Data;
+import com.yonde.dex.basedata.entity.annotation.*;
+import java.math.BigInteger;
+import javax.persistence.*;
+import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import com.yonde.dex.dao.entity.base.IdEntity;
+import javax.persistence.Column;
+import com.yonde.dex.linkdata.plugin.entities.DxLinkDataHolder;
+import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
+import com.yonde.dex.dao.entity.base.IdOnlyEntity;
+import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
+
+/**
+* @description: ExtProjectTopicLink-PO实体
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+@Entity
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@Data
+@Table(name = "EXT_PROJECT_TOPIC_LINK")
+public class ExtProjectTopicLink extends IdOnlyEntity implements IdEntity ,DxLinkDataHolder{
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @Embedded()
+    private DxIdEntityEmbeddable dxIdEmbeddable;
+    /**
+    * 扩展PO属性
+    */
+    @DexEmbedded()
+    @Embedded()
+    private DxLinkDataEmbeddable dxLinkDataEmbeddable;
+}
+
+

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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 @ToString
 @Embeddable

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

@@ -10,7 +10,7 @@ import com.yonde.dex.basic.expand.entity.DxViewExpand;
 * @description: DxView-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 @ToString
 @Embeddable

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

@@ -19,7 +19,7 @@ import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
 * @description: DxContext-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-28 10:59:10
 **/
 @ToString
 @Embeddable
@@ -44,6 +44,14 @@ public class DxContextExpand implements Serializable{
     */
     private Integer budgetAmount;
     /**
+    * 合同编码
+    */
+    private String contractCode;
+    /**
+    * 合同编码说明
+    */
+    private String contractCodeExplanation;
+    /**
     * 客户单位
     */
     private String customUnit;

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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @ToString
 @Embeddable

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

@@ -11,7 +11,7 @@ import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 * @description: DxContextEnterprise-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxContextEnterprisePluginExpand {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 * @description: DxContextLibrary-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxContextLibraryPluginExpand {
 

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

@@ -14,7 +14,7 @@ import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
 * @description: DxContext-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-28 10:59:10
 **/
 public interface DxContextPluginExpand extends DxObjFileLinkHolder ,DxSecretHolder{
 
@@ -22,6 +22,9 @@ public interface DxContextPluginExpand extends DxObjFileLinkHolder ,DxSecretHold
 
     void setDxContextExpand(DxContextExpand dxContextExpand);
 
+    default String getContractCode() {
+        return DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextExpand()).getContractCode();
+    }
     default Integer getBudgetAmount() {
         return DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextExpand()).getBudgetAmount();
     }
@@ -34,6 +37,9 @@ public interface DxContextPluginExpand extends DxObjFileLinkHolder ,DxSecretHold
     default void setCustomUnit(String customUnit) {
         DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextExpand()).setCustomUnit(customUnit);
     }
+    default void setContractCodeExplanation(String contractCodeExplanation) {
+        DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextExpand()).setContractCodeExplanation(contractCodeExplanation);
+    }
     default void setBudgetAmount(Integer budgetAmount) {
         DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextExpand()).setBudgetAmount(budgetAmount);
     }
@@ -52,6 +58,9 @@ public interface DxContextPluginExpand extends DxObjFileLinkHolder ,DxSecretHold
     }
     default void setEndTime(LocalDateTime endTime) {
         DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextExpand()).setEndTime(endTime);
+    }
+    default void setContractCode(String contractCode) {
+        DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextExpand()).setContractCode(contractCode);
     }
             @Override
     default void setDxSecretEmbeddable(DxSecretEmbeddable dxSecretEmbeddable) {
@@ -114,6 +123,9 @@ public interface DxContextPluginExpand extends DxObjFileLinkHolder ,DxSecretHold
     default String getProType() {
         return DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextExpand()).getProType();
     }
+    default String getContractCodeExplanation() {
+        return DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextExpand()).getContractCodeExplanation();
+    }
 //            @Override
     default void setDxObjFileLinkEmbeddable(DxObjFileLinkEmbeddable dxObjFileLinkEmbeddable) {
         DxExpandUtils.getNotNullObject(this::getDxContextExpand,this::setDxContextExpand,new DxContextExpand()).setDxObjFileLinkEmbeddable(dxObjFileLinkEmbeddable);

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

@@ -11,7 +11,7 @@ import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 * @description: DxContextProduction-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxContextProductionPluginExpand {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 * @description: DxContextProject-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxContextProjectPluginExpand {
 

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

@@ -10,7 +10,7 @@ import com.yonde.dex.context.expand.entity.DxContextTeamMemberExpand;
 * @description: DxContextTeamMember-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxContextTeamMemberPluginExpand {
 

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

@@ -10,7 +10,7 @@ import com.yonde.dex.context.expand.entity.DxContextTeamExpand;
 * @description: DxContextTeam-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 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-10-18 9:59:55
+* @date: 2024-10-22 13:49:41
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 @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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 @ToString
 @Embeddable

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

@@ -10,7 +10,7 @@ import com.yonde.dex.user.expand.entity.DxGroupLinkExpand;
 * @description: DxGroupLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxGroupLinkPluginExpand {
 

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

@@ -10,7 +10,7 @@ import com.yonde.dex.user.expand.entity.DxGroupMemberLinkExpand;
 * @description: DxGroupMemberLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxGroupMemberLinkPluginExpand {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalPluginExpand;
 * @description: DxGroup-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxGroupPluginExpand {
 

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

@@ -10,7 +10,7 @@ import com.yonde.dex.user.expand.entity.DxOrganizationGroupLinkExpand;
 * @description: DxOrganizationGroupLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxOrganizationGroupLinkPluginExpand {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalPluginExpand;
 * @description: DxOrganization-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxOrganizationPluginExpand {
 

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

@@ -10,7 +10,7 @@ import com.yonde.dex.user.expand.entity.DxPostMemberLinkExpand;
 * @description: DxPostMemberLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxPostMemberLinkPluginExpand {
 

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

@@ -10,7 +10,7 @@ import com.yonde.dex.user.expand.entity.DxPostExpand;
 * @description: DxPost-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxPostPluginExpand {
 

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

@@ -10,7 +10,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalLinkExpand;
 * @description: DxPrincipalLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:42
 **/
 public interface DxPrincipalLinkPluginExpand {
 

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

@@ -10,7 +10,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalExpand;
 * @description: DxPrincipal-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxPrincipalPluginExpand {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalPluginExpand;
 * @description: DxUserInfo-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 public interface DxUserInfoPluginExpand {
 

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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @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/ExtProjectContractLinkServiceFeign.java

@@ -10,7 +10,7 @@ import com.yonde.dex.basic.feign.shadow.ExtProjectContractLinkServiceFeignShadow
 * @description: ExtProjectContractLink-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 @Api(tags = "ExtProjectContractLink-FEIGN")
 @FeignClient(value = "${dex.feign.DEX-BASIC-SERVICE}", path = "/ExtProjectContractLink")

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

+package com.yonde.dex.basic.feign;
+
+import com.yonde.dex.basic.common.vo.ExtProjectTopicLinkVO;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dex.basic.feign.shadow.ExtProjectTopicLinkServiceFeignShadow;
+
+/**
+* @description: ExtProjectTopicLink-Feign
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+@Api(tags = "ExtProjectTopicLink-FEIGN")
+@FeignClient(value = "${dex.feign.DEX-BASIC-SERVICE}", path = "/ExtProjectTopicLink")
+public interface ExtProjectTopicLinkServiceFeign<V extends ExtProjectTopicLinkVO> extends ExtProjectTopicLinkServiceFeignShadow<V> {
+
+}

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

@@ -12,7 +12,7 @@ import com.yonde.dex.dao.service.adapter.DexExpandBeanReplace;
 * @description: DxContextProject-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 @Api(tags = "DxContextProject-FEIGN")
 @FeignClient(value = "${dex.feign.DEX-BASIC-SERVICE}", path = "/DxContextProject")

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-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 @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/ExtDxContextProjectServiceFeignShadow.java

@@ -11,7 +11,7 @@ import com.yonde.dex.context.feign.ContextServiceFeign;
 * @description: DxContextProject-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:43
 **/
 public interface ExtDxContextProjectServiceFeignShadow<V extends DxContextProjectVO> extends ContextServiceFeign<V> ,ContextProjectServiceFeign<V> {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.context.feign.ContextServiceFeign;
 * @description: DxContext-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:55
+* @date: 2024-10-22 13:49:43
 **/
 public interface ExtDxContextServiceFeignShadow<V extends DxContextVO> extends ContextServiceFeign<V> ,SecretCodeFeign<V> {
 

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-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 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

@@ -12,7 +12,7 @@ import com.yonde.dex.secretcode.plugin.feign.SecretCodeFeign;
 * @description: ExtProgram-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 public interface ExtProgramServiceFeignShadow<V extends ExtProgramVO> extends BaseLifecycleManageFeign<V> ,BaseFeign<V> ,SecretCodeFeign<V> {
 

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

@@ -11,7 +11,7 @@ import com.yonde.dex.linkdata.plugin.feign.DxLinkDataFeign;
 * @description: ExtProjectContractLink-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-18 9:59:56
+* @date: 2024-10-22 13:49:44
 **/
 public interface ExtProjectContractLinkServiceFeignShadow<V extends ExtProjectContractLinkVO> extends BaseFeign<V> ,DxLinkDataFeign<V> {
 

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

+package com.yonde.dex.basic.feign.shadow;
+
+import com.yonde.dex.basic.common.vo.ExtProjectTopicLinkVO;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dex.dao.service.remotes.BaseFeign;
+import com.yonde.dex.linkdata.plugin.feign.DxLinkDataFeign;
+
+/**
+* @description: ExtProjectTopicLink-Feign
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-22 13:49:44
+**/
+public interface ExtProjectTopicLinkServiceFeignShadow<V extends ExtProjectTopicLinkVO> extends BaseFeign<V> ,DxLinkDataFeign<V> {
+
+    String BEAN_NAME = "extProjectTopicLinkServiceFeign";
+
+}