Merge branch 'oa' into dev

pkg/model/approval_oa.go

@@ -19,12 +19,12 @@ type ApprovalOA struct {
 	CreatedAt  time.Time             `gorm:"column:created_at" json:"createdAt"`   // 创建时间
 	UpdatedAt  time.Time             `gorm:"column:updated_at" json:"updatedAt"`   // 更新时间
 	ApprovalID uint64                `gorm:"column:approval_id" json:"approvalID"` // 申请的id
-	LeaveApply LeaveApply            `json:"leaveApply" gorm:"column:leave_apply;type:json;comment:假期余额申请"`
+	LeaveApply *LeaveApply           `json:"leaveApply" gorm:"column:leave_apply;type:json;comment:假期余额申请"`
-	OutWork    OutWorkApply          `json:"outWork" gorm:"column:out_work;type:json;comment:外勤"`
+	OutWork    *OutWorkApply         `json:"outWork" gorm:"column:out_work;type:json;comment:外勤"`
-	MakeUp     MakeUpApply           `json:"makeUp" gorm:"column:make_up;type:json;comment:加班"`
+	MakeUp     *MakeUpApply          `json:"makeUp" gorm:"column:make_up;type:json;comment:加班"`
-	Turnover   TurnoverApply         `json:"turnover" gorm:"column:turnover;type:json;comment:离职"`
+	Turnover   *TurnoverApply        `json:"turnover" gorm:"column:turnover;type:json;comment:离职"`
-	OverTime   OverTimeApply         `json:"overTime" gorm:"column:over_time;type:json;comment:加班"`
+	OverTime   *OverTimeApply        `json:"overTime" gorm:"column:over_time;type:json;comment:加班"`
-	Leave      Leave                 `json:"leave" gorm:"column:leave;type:json;comment:请假"`
+	Leave      *Leave                `json:"leave" gorm:"column:leave;type:json;comment:请假"`
 }
 
 // LeaveApply