完成常驻进程

internal/dao/dao.go

@@ -35,12 +35,9 @@ type (
 		GetCompanyModelByProjectid(c context.Context, companyId int64) (r map[string]string, err error)
 		GetModelTopsetByProjectId(c context.Context, companyId int64) (r map[string]string, err error)
 		UpdateStaticSumScores(c context.Context,com_credits model.ComCredits) (resId int64, err error)
-<<<<<<< HEAD
 		GetCompanyModelItemsByProjectid(c context.Context, project_id int64 , score float64) (res map[string]string, err error)
 		GetCompanyModelItemsByProjectidWitchString(c context.Context, project_id int64 , stringVal string) (res map[string]string, err error)
-=======
 		UpdateMoveSumScores(c context.Context,com_credits model.ComCredits) (resId int64, err error)
->>>>>>> 604a245ba1f6aa5be22837a9e9d0ce8ea80ddbfe
 		//---静态结束
 
 		//---动态开始