diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index 6801001246..3f29beb098 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java @@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.terminal", "com.yxt.common.base.config" },exclude = {DataSourceAutoConfiguration.class}) -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory","com.yxt.anrui.terminal.fegin.wmswarehouserack","com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail","com.yxt.anrui.terminal.fegin.wmsinventoryrecord"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory","com.yxt.anrui.terminal.fegin.wmswarehouserack","com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail","com.yxt.anrui.terminal.fegin.wmsinventoryrecord","com.yxt.anrui.terminal.fegin.asstandrecordapply"}) public class TerminalApplication { public static void main(String[] args) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApply.java index 085dcfdb0d..aa9f491f93 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApply.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApply.java @@ -91,7 +91,7 @@ public class AsStandRecordApply extends BaseEntity { @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id @ApiModelProperty("环节定义的sid") - private String nodeSid; // 环节定义的sid + private String nodeId; // 环节定义的sid @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid @ApiModelProperty("taskId") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDetailsVo.java index a1f0d25f2f..d3b34f0186 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDetailsVo.java @@ -99,8 +99,8 @@ public class AsStandRecordApplyDetailsVo implements Vo { private String nodeState; // 流程状态 @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") - private String nodeSid; // 环节定义的sid + @ApiModelProperty("环节定义的sid") + private String nodeId; // 环节定义的sid @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid @ApiModelProperty("taskId") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDto.java index b7e382dc62..7a3e003796 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asstandrecordapply/AsStandRecordApplyDto.java @@ -94,8 +94,8 @@ public class AsStandRecordApplyDto implements Dto { private String nodeState; // 流程状态 @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") - private String nodeSid; // 环节定义的sid + @ApiModelProperty("环节定义的sid") + private String nodeId; // 环节定义的sid @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid @ApiModelProperty("taskId")