'commit'

dsBaseRpc/RpcService/BaseStudent/BaseStudentService/BaseStudentService.go

@@ -83,7 +83,7 @@ func (s *Rpc) AddBaseStudent(ctx context.Context, in *BaseStudentProto.ModelArg)
 		model.Csrq = DateUtil.ConvertDateTime(birthday)
 		model.Xbm = xbm
 	} else {
-		model.Csrq = CommonUtil.ConvertStringToTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
 		model.Xbm = "1"
 	}
 	//民族 （有字典）
@@ -268,7 +268,7 @@ func (s *Rpc) UpdateBaseStudent(ctx context.Context, in *BaseStudentProto.ModelA
 		model.Xbm = xbm
 	} else {
 		//如果不是身份证号，那就用个默认值吧
-		model.Csrq = CommonUtil.ConvertStringToTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
 		model.Xbm = "1"
 	}
 	model.PersonId = in.PersonId

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go

@@ -112,7 +112,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 		}
 		model.Xbm = xbm
 	} else {
-		model.Csrq = CommonUtil.ConvertStringToTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
 		model.Xbm = in.Xbm
 	}
 	model.Mzm = in.Mzm
@@ -288,7 +288,7 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
 		}
 		model.Xbm = xbm
 	} else {
-		model.Csrq = CommonUtil.ConvertStringToTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
 		model.Xbm = in.Xbm
 	}
 	model.Mzm = in.Mzm

dsBaseRpc/Utils/CommonUtil/CommonUtil.go

@@ -631,9 +631,3 @@ func CopyFields(sourceStruct interface{}, targetStruct interface{}, fields ...st
 	}
 	return
 }
-
-//将字符串转化为时间格式
-func ConvertStringToTime(str string) time.Time {
-	t, _ := time.ParseInLocation("2006-01-02", str, time.Local)
-	return t
-}