|
|
|
|
@ -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
|
|
|
|
|
|
