修改

pkg/model/approval.go

@@ -51,11 +51,7 @@ type Approval struct {
 	BundlePayPrice    *BundlePayPrice       `gorm:"foreignKey:ApprovalID" json:"BundlePayPrice"`   //关联的type
 	ExhibitionReward  *ExhibitionReward     `gorm:"foreignKey:ApprovalID" json:"ExhibitionReward"` //关联的type
 	ApprovalWorkFlows []*ApprovalWorkFlow   `gorm:"foreignKey:ApprovalID" json:"ApprovalWorkFlows"`
-<<<<<<< Updated upstream
-	ApprovalOA        *ApprovalOA           `gorm:"foreignKey:ApprovalID" json:"OA"`
-=======
 	ApprovalOA        *ApprovalOA           `gorm:"foreignKey:ApprovalID" json:"oa"`
->>>>>>> Stashed changes
 }
 
 func (j *KeyInfos) Scan(src interface{}) error {

pkg/model/approval_type.go

@@ -39,7 +39,6 @@ var TypeMap = map[string]string{
 	"show":                  "",
 	TypeBundlePayPrice:      "",
 	TypeArtExhibitionReward: "",
-<<<<<<< Updated upstream
 
 	"leave":            "oa", // 事假
 	"sick":             "oa", // 病假
@@ -66,25 +65,6 @@ var TypeMap = map[string]string{
 	"parentalLeaveApply":    "oa", // 育儿假申请
 	"nursingLeaveApply":     "oa", // 独生子女护理假申请
 
-
-	/*=================================*/
-	// TODO    育儿假 等 额度 审批
-	TypeOaLeave:            "oa", // 事假
-	TypeOaSick:             "oa", // 病假
-	TypeOaAnnualLeave:      "oa", // 年假
-	TypeOaDayOff:           "oa", // 调休
-	TypeOaMaritalLeave:     "oa", // 婚假
-	TypeOaMatingCheckLeave: "oa", // 孕检假
-	TypeOaMaternityLeave:   "oa", // 产假
-	TypeOaPaternityLeave:   "oa", // 陪产假
-	TypeOaParentalLeave:    "oa", // 育儿假
-	TypeOaNursingLeave:     "oa", // 独生子女护理假
-	TypeOaFuneralLeave:     "oa", // 丧假
-	TypeOaMakeUp:           "oa", // 补卡
-	TypeOaOvertime:         "oa", // 加班
-	TypeOaOutwork:          "oa", // 外勤
-	TypeOaTurnover:         "oa", // 离职
-
 }
 
 var keyWordMap = map[string]string{