Merge remote-tracking branch 'origin/master'

src/main/resources/mappings/modules/disputeMediation/ProjectNonPrelitigationMediationDao.xml

@@ -151,7 +151,9 @@
 			mediation_process,
 			plaintiff_claim,
 			respondent_opinion,
-			undisputed_fact
+			undisputed_fact,
+			office_id,
+			company_id
         ) values (
             #{id},
 			#{createBy.id},
@@ -172,7 +174,9 @@
 			#{mediationProcess},
 			#{plaintiffClaim},
 			#{respondentOpinion},
-			#{undisputedFact}
+			#{undisputedFact},
+			#{officeId},
+			#{companyId}
         )
     </insert>
 
@@ -193,7 +197,9 @@
 			mediation_process = #{mediationProcess},
 			plaintiff_claim = #{plaintiffClaim},
 			respondent_opinion = #{respondentOpinion},
-			undisputed_fact = #{undisputedFact}
+			undisputed_fact = #{undisputedFact},
+			office_id = #{officeId},
+			company_id = #{companyId}
 		where id = #{id}
     </update>
 

src/main/resources/mappings/modules/disputeMediation/ProjectPrelitigationMediationDao.xml

@@ -156,7 +156,9 @@
 			mediation_process,
 			plaintiff_claim,
 			respondent_opinion,
-			undisputed_fact
+			undisputed_fact,
+			office_id,
+			company_id
         ) values (
             #{id},
 			#{createBy.id},
@@ -177,7 +179,9 @@
 			#{mediationProcess},
 			#{plaintiffClaim},
 			#{respondentOpinion},
-			#{undisputedFact}
+			#{undisputedFact},
+			#{officeId},
+			#{companyId}
         )
     </insert>
 
@@ -198,7 +202,9 @@
 			mediation_process = #{mediationProcess},
 			plaintiff_claim = #{plaintiffClaim},
 			respondent_opinion = #{respondentOpinion},
-			undisputed_fact = #{undisputedFact}
+			undisputed_fact = #{undisputedFact},
+			office_id = #{officeId},
+			company_id = #{companyId}
 		where id = #{id}
     </update>