Merge branch 'master' into dev-v1.1

wupengfei

107 分钟以前 7cf04da7eaba7cad9c3b5e5f674d2e038ebcd305

 packages/services/apiV2/typings.d.ts

@@ -76,6 +76,8 @@
  interface APIgetEnabledElectronSignSettingsParams {
    /** 企业Id */
    enterpriseId?: string;
    /** 是否查询全部 */
    all?: boolean;
  }

  interface APIgetEnterpriseContractTemplateSelectParams {
@@ -653,6 +655,15 @@
    Transfer = 20,
  }

  enum EnumGetEnterpriseEmployeesQuerySignContractStatus {
    /**灵工待签约 */
    UserWait = 10,
    /**企业待签约 */
    EnterpriseWait = 20,
    /**已签约 */
    Pass = 30,
  }

  enum EnumMenuType {
    /**菜单 */
    Menu = 10,
@@ -728,9 +739,9 @@
  enum EnumPersonalUserRealStatus {
    /**未实名 */
    UnReal = 0,
    /**校验中 */
    /**认证中 */
    Checking = 10,
    /**实名失败 */
    /**认证失败 */
    Fail = 99,
    /**已实名 */
    Real = 100,
@@ -2689,6 +2700,7 @@
    date?: string;
    /** 提交时间 */
    createdTime?: string;
    checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
    /** 验收照片 */
    files?: string[];
  }
@@ -2993,6 +3005,8 @@

  interface GetEnabledElectronSignSettingsQueryResultItem {
    access?: EnumElectronSignAccess;
    /** 是否禁用 */
    isDisabled?: boolean;
    /** 实名费用 */
    realVerifyCost?: number;
    /** 签约费用 */
@@ -3134,6 +3148,7 @@
    isReal?: boolean;
    userSignContractStatus?: EnumTaskUserSignContractStatus;
    enterpriseSignContractStatus?: EnumTaskUserSignContractStatus;
    signContractStatus?: EnumGetEnterpriseEmployeesQuerySignContractStatus;
    pageModel?: PagedListQueryPageModel;
  }

@@ -3336,10 +3351,6 @@
    /** 钱包Id */
    id?: string;
    access?: EnumEnterpriseWalletAccess;
    /** 账号 */
    account?: string;
    /** 商户Id */
    merchantId?: string;
    /** 协议号 */
    code?: string;
    /** 通道协议号 */
@@ -3351,6 +3362,21 @@
    /** 协议失效时间 */
    invalidTime?: string;
    signStatus?: EnumEnterpriseWalletSignStatus;
    /** 支付宝姓名 */
    name?: string;
    /** 支付宝登录账号 */
    identity?: string;
    scene?: EnumEnterpriseWalletExpandindirectOrderScene;
    /** 转账场景说明 */
    sceneDirections?: string;
    orderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
    /** 进件单任务完结时间 */
    taskFinishTime?: string;
    /** 进件单审核不通过原因 */
    riskReviewRemark?: string;
    sitesInfo?: GetEnterpriseWalletExpandindirectOrderQueryResultSites;
    /** 附件 */
    files?: GetEnterpriseWalletExpandindirectOrderQueryResultFile[];
    expandindirectOrderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
  }

@@ -3759,6 +3785,9 @@
    contactPhoneNumber?: string;
    /** 是否实名 */
    isReal?: boolean;
    realStatus?: EnumPersonalUserRealStatus;
    /** 实名失败消息 */
    realFailMessage?: string;
    realMethod?: EnumUserRealMethod;
    /** 我的报名 */
    taskCount?: number;
@@ -4906,10 +4935,6 @@
    /** 企业Id */
    enterpriseId?: string;
    access?: EnumEnterpriseWalletAccess;
    /** 账号 */
    account?: string;
    /** 商户Id */
    merchantId?: string;
  }

  interface OpenEnterpriseWalletCommandResult {