Merge branch 'develop' into MVP1.2

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

@@ -153,4 +153,9 @@ public class EkpPushFundParam implements Serializable {
 	 **/
 	private String fd_3b43922217c6f8;
 
+	/**
+	 * 公积金创建人姓名
+	 **/
+	private String fd_3b5cc487bb46fa;
+
 }
\ No newline at end of file

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

@@ -257,4 +257,9 @@ public class EkpPushSocialParam implements Serializable {
 	 **/
 	private String fd_3b438e33f37378;
 
+	/**
+	 * 社保创建人姓名
+	 **/
+	private String fd_3b5cc58d1a70fe;
+
 }
\ No newline at end of file

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -2986,6 +2986,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				} else {
 					socialParam.setFd_3b438e33f37378(CommonConstants.EMPTY_STRING);
 				}
+				// 缴纳地
+				if (Common.isNotNull(library.getSocialPayAddr())){
+					socialParam.setFd_3b5cc58d1a70fe(library.getSocialPayAddr());
+				}else {
+					socialParam.setFd_3b5cc58d1a70fe(CommonConstants.EMPTY_STRING);
+				}
 				//我司到款单位
 				socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING);
 				//社保id
@@ -3119,6 +3125,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				} else {
 					fundParam.setFd_3b43922217c6f8(CommonConstants.EMPTY_STRING);
 				}
+				//公积金缴纳地
+				if (Common.isNotNull(library.getProvidentPayAddr())) {
+					fundParam.setFd_3b5cc487bb46fa(library.getProvidentPayAddr());
+				} else {
+					fundParam.setFd_3b5cc487bb46fa(CommonConstants.EMPTY_STRING);
+				}
 				doJointSocialTask.asynchronousEkpPaymentFund(fundParam, library);
 			}
 		}catch (Exception e) {