diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantReceiverApplyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantReceiverApplyVo.java index 7c8ce2288..61ec8c907 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantReceiverApplyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantReceiverApplyVo.java @@ -53,7 +53,7 @@ public class WxMerchantReceiverApplyVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="微信支付申请单号",name="applymentId") private String applymentId; @Excel(name="进件状态",width = 20,orderNum = "8",replace = {"编辑中_1", "提交审核成功_11", "资料效验中_2", "审核中_3", "已驳回_4", - "待账户验证_5", "待签约_6", "功能开通中_7", "完成_8", "已冻结_9", "已作废_10"}) + "待账户验证_5", "待签约_6", "功能开通中_7", "已完成_8", "已冻结_9", "已作废_10"}) @io.swagger.annotations.ApiModelProperty(value="EnumSharingReceiverApplymentState 申请状态",name="applymentState") private Integer applymentState; @Excel(name="进件状态描述",width = 20,orderNum = "9") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverApplymentState.java b/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverApplymentState.java index e5b98b12c..625bed1d8 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverApplymentState.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverApplymentState.java @@ -26,7 +26,7 @@ public enum EnumSharingReceiverApplymentState { APPLYMENT_STATE_TO_BE_CONFIRMED(5, ApplymentStateEnum.APPLYMENT_STATE_TO_BE_CONFIRMED,"待账户验证"), APPLYMENT_STATE_TO_BE_SIGNED(6, ApplymentStateEnum.APPLYMENT_STATE_TO_BE_SIGNED,"待签约"), APPLYMENT_STATE_SIGNING(7, ApplymentStateEnum.APPLYMENT_STATE_SIGNING,"开通权限中"), - APPLYMENT_STATE_FINISHED(8, ApplymentStateEnum.APPLYMENT_STATE_FINISHED,"完成"), + APPLYMENT_STATE_FINISHED(8, ApplymentStateEnum.APPLYMENT_STATE_FINISHED,"已完成"), // APPLYMENT_STATE_FROZEN(9, "FROZEN", "已冻结"), APPLYMENT_STATE_CANCELED(10, ApplymentStateEnum.APPLYMENT_STATE_CANCELED,"已作废"), ;