Merge remote-tracking branch 'origin/develop' into develop

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java

@@ -90,7 +90,7 @@ public class SocialDaprUtils {
 	 * @return
 	 **/
 	public R<TIncomeDetailReturnVo> getTIncomeDetailList(TIncomeDetail infoVo) {
-		R<TIncomeDetailReturnVo> listVo = HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincomedetail/inner/getTIncomeDetailList", JSON.toJSONString(infoVo), TIncomeDetail.class, SecurityConstants.FROM_IN);
+		R<TIncomeDetailReturnVo> listVo = HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincomedetail/inner/getTIncomeDetailList", JSON.toJSONString(infoVo), TIncomeDetailReturnVo.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(listVo)){
 			return R.failed("查询人员收入数据失败！");
 		}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -1106,7 +1106,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								detail.setDefaultSettleId(null);
 							}
 							//已投保退回，收入数据同步处理
+							try{
 								updateInsuranceInfo(detail,settle);
+							}catch (Exception e){
+								log.error("收入数据同步处理失败："+e);
+							}
+
 						}
 					}
 				}