From af9932d1d6fe3bd56799dcd8b4d76dc993c5c1db Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 六月 2024 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java b/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java
index 163de63..1120564 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java
@@ -52,7 +52,7 @@
//鍔犲噺淇濈敵璇锋暟鎹�
- public MemberInsurance(ApplyChagneDetail applyChangeDetail, ApplyChange applyChange, Integer sysUserId,Integer applyDetailId){
+ public MemberInsurance(ApplyChagneDetail applyChangeDetail, ApplyChange applyChange, Integer sysUserId,Integer applyDetailId,Integer solutionId){
this.createDate = new Date();
this.creator = sysUserId;
this.isdeleted = Constants.ZERO;
@@ -73,6 +73,7 @@
this.duName = applyChangeDetail.getDuName();
// this.relationType = Constants.ONE;
this.relationId = applyDetailId;
+ this.solutionId=solutionId;
}
@@ -131,7 +132,7 @@
@ApiModelProperty(value = "宸ョ缂栫爜(鍏宠仈worktype)", example = "1")
private Integer worktypeId;
- @ApiModelProperty(value = "褰撳墠浜х敓璐圭敤", example = "1")
+ @ApiModelProperty(value = "褰撳墠宸蹭骇鐢熻垂鐢�", example = "1")
private BigDecimal currentFee;
@ApiModelProperty(value = "璐圭敤", example = "1")
@@ -170,11 +171,12 @@
@TableField(exist = false)
private Integer sn;
-
-
@ApiModelProperty(value = "鍏宠仈鏄庣粏涓婚敭", example = "1")
private Integer relationId;
+ @ApiModelProperty(value = "鍏宠仈绫诲瀷锛�0=鎶曚繚鐢宠锛�1=鍔犲噺淇�/鎹㈠巶", example = "1")
+ private Integer relationType;
+
@ApiModelProperty(value = "鍛樺伐鍚嶇О", example = "1")
@TableField(exist = false)
private String memberName;
--
Gitblit v1.9.3