'commit'

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go

@@ -289,7 +289,11 @@ 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

dsBaseRpc/Utils/DateUtil/DateUtil.go

@@ -21,6 +21,7 @@ const TimeLayoutStr= "2006-01-02 15:04:05" //go中的时间格式化必须是这
 //	st, _ := time.Parse(TimeLayoutStr, ts)    //string转time
 //	return st
 //}
+
 func ConvertDate(ts string) time.Time {
 	st, _ := time.Parse(TimeLayoutStr, ts+" 00:00:00")    //string转time
 	return st