Merge branch 'oa' into dev

pkg/model/approval_oa.go

@@ -389,12 +389,12 @@ func (oa *ApprovalOA) BuildResContent(a *Approval, request *approval.CreateReque
 	}
 }
 
-func (oa *ApprovalOA) copyOAToRpc(a *Approval, in *approval.CreateRequest) error {
+func (oa *ApprovalOA) copyOAToRpc(a *Approval, request *approval.CreateRequest) error {
-	copier.CopyWithOption(&in.ApprovalOA, a.ApprovalOA, copier.Option{DeepCopy: true})
+	copier.CopyWithOption(&request.ApprovalOA, a.ApprovalOA, copier.Option{DeepCopy: true})
 
 	fmt.Println("============== 查询 审批内容  1.0 ========== 开始 =========")
 	fmt.Printf("approval_oa info is : %+v\n", a)
-	fmt.Printf("in.ApprovalOA info is : %+v\n", in.ApprovalOA)
+	fmt.Printf("request.ApprovalOA info is : %+v\n", request.ApprovalOA)
 	fmt.Println("============== 查询 审批内容 ========== 结束 =========")
 
 	return nil