Merge branch 'develop' into 'master'

Develop

See merge request !320

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

@@ -2143,14 +2143,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								//推送修改信息
 								StringBuilder sb = new StringBuilder();
 								sb.append("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-								if (!oldDetail.getPolicyStart().toString().equals(success.getPolicyStartNew())) {
-									sb.append(";变更前保单开始时间:" + oldDetail.getPolicyStart() + ";变更后保单开始时间:" + success.getPolicyStartNew());
+								if (!oldDetail.getPolicyStart().toString().equals(detail.getPolicyStart().toString())) {
+									sb.append(";变更前保单开始时间:" + oldDetail.getPolicyStart() + ";变更后保单开始时间:" + detail.getPolicyStart());
 								}
-								if (!oldDetail.getPolicyEnd().toString().equals(success.getPolicyEndNew())) {
-									sb.append(";变更前保单结束时间:" + oldDetail.getPolicyEnd() + ";变更后保单结束时间:" + success.getPolicyEndNew());
+								if (!oldDetail.getPolicyEnd().toString().equals(detail.getPolicyEnd().toString())) {
+									sb.append(";变更前保单结束时间:" + oldDetail.getPolicyEnd() + ";变更后保单结束时间:" + detail.getPolicyEnd());
 								}
-								if (!oldDetail.getBuyType().equals(success.getBuyType())) {
-									sb.append(";变更前投保类型:" + getBuyType(oldDetail.getBuyType()) + ";变更后投保类型:" + getBuyType(success.getBuyType()));
+								if (!oldDetail.getBuyType().equals(detail.getBuyType())) {
+									sb.append(";变更前投保类型:" + getBuyType(oldDetail.getBuyType()) + ";变更后投保类型:" + getBuyType(detail.getBuyType()));
 								}
 								if (StringUtils.isNotBlank(success.getReason())){
 									sb.append(";变更原因:" + success.getReason());