Commit dc9f7f0b authored by 查济's avatar 查济

Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:新增登记保单保费,商险办理成功,商险退回的EKP交互"

See merge request fangxinjiang/yifu!159
parents 196ebb65 a4b626e4
...@@ -36,17 +36,17 @@ public class InsurancesConstants { ...@@ -36,17 +36,17 @@ public class InsurancesConstants {
*/ */
public static final String CHANGE_ERROR = "数据发生变动,请刷新数据后重新办理"; public static final String CHANGE_ERROR = "数据发生变动,请刷新数据后重新办理";
/** /**
* 导出办理 * 投保导出办理
*/ */
public static final String EXPORT = "导出办理"; public static final String EXPORT = "投保导出办理";
/** /**
* 投保退回 * 投保退回
*/ */
public static final String ROLLBACK = "投保退回"; public static final String ROLLBACK = "投保退回";
/** /**
* 办理成功 * 投保办理成功
*/ */
public static final String SUCCESSFUL = "办理成功"; public static final String SUCCESSFUL = "投保办理成功";
/** /**
* 登记保单保费 * 登记保单保费
*/ */
...@@ -687,18 +687,18 @@ public class InsurancesConstants { ...@@ -687,18 +687,18 @@ public class InsurancesConstants {
public static final String INSURANCE_REFUND_IMPORT = "导入减员数据"; public static final String INSURANCE_REFUND_IMPORT = "导入减员数据";
/** /**
* 导出待减员数据 * 减员导出办理
*/ */
public static final String INSURANCE_REFUND_EXPORT = "导出待减员数据"; public static final String INSURANCE_REFUND_EXPORT = "减员导出办理";
/** /**
* 减员成功 * 减员办理成功
*/ */
public static final String INSURANCE_REFUND_SUCCESS = "减员成功"; public static final String INSURANCE_REFUND_SUCCESS = "减员办理成功";
/** /**
* 减员退回 * 减员退回成功
*/ */
public static final String INSURANCE_REFUND_FAILED = "减员退回"; public static final String INSURANCE_REFUND_FAILED = "减员退回";
......
...@@ -36,7 +36,7 @@ public class EKPInteractiveParam implements Serializable { ...@@ -36,7 +36,7 @@ public class EKPInteractiveParam implements Serializable {
/** /**
* 单据类型 (0、与薪资合并结算 1、单独结算) * 单据类型 (0、与薪资合并结算 1、单独结算)
*/ */
@Schema(description = "单据类型 (0、预估单 1、实缴单)") @Schema(description = "单据类型 (1、预估单 2、实缴单)")
private Integer settleType; private Integer settleType;
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment