Merge remote-tracking branch 'origin/developer' into test_branch

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -984,7 +984,7 @@ public class StaffApiServiceImpl implements StaffApiService {
                     //置空转移成员的许可信息
                     staffMapper.updateStaffInfoByStaffId(handoverStaff.getStaffId(),null,null,null,0);
                     //更新接收成员的许可信息
-                    staffMapper.updateStaffInfoByStaffId(takeOverStaff.getStaffId(),takeOverStaff.getActiveTime(),takeOverStaff.getExpireTime(), takeOverStaff.getActiveCode(),1);
+                    staffMapper.updateStaffInfoByStaffId(takeOverStaff.getStaffId(),handoverStaff.getActiveTime(),handoverStaff.getExpireTime(), handoverStaff.getActiveCode(),1);
 
                 }else{
                     //企微转移失败,记录失败明细