Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java

@@ -255,7 +255,7 @@ public class EkpSalaryParam implements Serializable {
 	 **/
 	private String fd_3af9d49d165e90;
 	/**
-	 * 税务主体
+	 * 税务主体-封面抬头
 	 **/
 	private String fd_3afab1895feea2;
 	/**
@@ -275,5 +275,9 @@ public class EkpSalaryParam implements Serializable {
 	 * 薪酬申请编号
 	 **/
 	private String fd_3b3bef19b61c38;
+	/**
+	 * 发放方式：银行、现金
+	 **/
+	private String fd_3bbbfdd1fc2950;
 
 }

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -208,6 +208,7 @@
 		<result property="fundSum" column="fund_sum"/>
 		<result property="fd_3b178f0ded2114" column="fd_3b178f0ded2114"/>
 		<result property="fd_3b3bef19b61c38" column="fd_3b3bef19b61c38"/>
+		<result property="fd_3bbbfdd1fc2950" column="fd_3bbbfdd1fc2950"/>
 	</resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -680,6 +681,7 @@
 			 ,concat(left(ifnull(a.DEDU_PROVIDENT_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_PROVIDENT_MONTH,'02'),2)) DEDU_PROVIDENT_MONTH
 			,ifnull(s.BPO_FLAG,'') fd_3b178f0ded2114
 			,ifnull(s.APPLY_NO,'') fd_3b3bef19b61c38
+			,if(a.SALARY_STYLE='0','现金','银行') fd_3bbbfdd1fc2950
 		from t_salary_account a
 			 LEFT JOIN t_salary_standard s on a.SALARY_FORM_ID=s.ID
 			 left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial'