From 2d528d024b179b6b06d1d2702e72f6caa5f67149 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 09:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 3221bcc..324108c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -1394,15 +1394,15 @@
member.setApplyId(insuranceApply.getId());
member.setDuId(applyChagneDetail.getDuId());
member.setWorktypeId(applyChagneDetail.getWorktypeId());
- member.setStartTime(applyChagneDetail.getStartTime());
- member.setEndTime(applyChagneDetail.getEndTime());
+// member.setStartTime(applyChagneDetail.getStartTime());
+// member.setEndTime(applyChagneDetail.getEndTime());
memberMapper.insert(member);
}else{
member.setApplyId(insuranceApply.getId());
member.setDuId(applyChagneDetail.getDuId());
member.setWorktypeId(applyChagneDetail.getWorktypeId());
- member.setStartTime(applyChagneDetail.getStartTime());
- member.setEndTime(applyChagneDetail.getEndTime());
+// member.setStartTime(applyChagneDetail.getStartTime());
+// member.setEndTime(applyChagneDetail.getEndTime());
memberMapper.updateById(member);
}
}else{
@@ -1555,8 +1555,8 @@
member.setApplyId(applyChange.getApplyId());
member.setDuId(applyChagneDetail.getDuId());
member.setWorktypeId(applyChagneDetail.getWorktypeId());
- member.setStartTime(applyChagneDetail.getStartTime());
- member.setEndTime(applyChagneDetail.getEndTime());
+// member.setStartTime(applyChagneDetail.getStartTime());
+// member.setEndTime(applyChagneDetail.getEndTime());
memberMapper.updateById(member);
}
--
Gitblit v1.9.3