Merge branch 'oa' into dev

pkg/model/approval_oa.go

@@ -39,6 +39,7 @@ type LeaveApply struct {
 	ActionTime    string        `json:"actionTime" gorm:"column:action_time;type:varchar(255);comment:操作|申请时间"`
 	ApprovalID    string        `json:"approvalID" gorm:"column:approval_id;type:varchar(255);comment:审批系统中的approvalID"`
 	Reason        string        `json:"reason" gorm:"column:reason;type:varchar(255);comment:理由"`
+	LeaveBalance  int32         `json:"leaveBalance" gorm:"column:leave_balance;type:int;comment:假期余额"`
 	Status        int32         `json:"status" gorm:"column:status;type:int;comment:状态(目前和审批系统状态同步)"`
 	VerifyFile    VerifyFiles   `json:"verifyFile" gorm:"column:verify_file;type:json;comment:证明文件(图片|pdf)"`
 	ApprovalUsers ApprovalUsers `json:"approvalUsers" gorm:"column:approval_users;type:json;comment:审批人"`