From f82e4b6ec3153d95f354f9c91a3c17237839188f Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Wed, 1 Jul 2020 17:24:56 +0800
Subject: [PATCH] 'commit'

---
 .../BaseTeacher/BaseTeacherService/BaseTeacherService.go      | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
index 83831077..61965a65 100644
--- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
+++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
@@ -289,11 +289,7 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
 	if len(in.Cjny) == 0 {
 		model.Cjny = DateUtil.ConvertDate("1900-01-01")
 	} else {
-<<<<<<< HEAD
 		model.Cjny = DateUtil.ConvertDate(in.Cjny+"-01")
-=======
-		model.Cjny = DateUtil.ConvertDateTime(in.Cjny + "-01 00:00:00")
->>>>>>> f0278f10174c91e54514edb017d7f950366e5bf7
 	}
 
 	model.StageId = in.StageId