员工管理模块的开发

routers/router.go

@@ -33,9 +33,7 @@ func init() {
 	marketing_tool.RegisterRouters()
 	article.RegisterRouters()
 	mpwechat.RegisterRouters()
-<<<<<<< .mine
 	staff.RegisterRouters()
-=======
 	kefu.RegisterRouters()
->>>>>>> .theirs
+
 }

service/marketing_tool_service/activity_service.go

@@ -164,63 +164,6 @@ func SaveActivityAndParagraph(activity *models.Activity, paragraph *models.Activ
 func SaveActivityWxShare(model *models.ActivityWxShare) error {
 	return service.PatientWriteDB().Save(model).Error
 }
-<<<<<<< .mine
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
 
 func GetValidActivitySignupUsers(activityID int64, keyWord string, page int) ([]*models.ActivityUser, int, error) {
 	var users []*models.ActivityUser
@@ -276,4 +219,3 @@ func DeleteActivity(orgID int64, activityID int64) error {
 	tx.Commit()
 	return nil
 }
->>>>>>> .theirs