feat: 1111

services/rule_service.go

@@ -46,11 +46,7 @@ func NewRuleService() RuleService {
 
 func (s *ruleService) Get(pid int, id int) viewmodels.ViewRule {
 	data := s.daoRule.FindByPidWithBid(pid, id)
-<<<<<<< Updated upstream
 	viewData := viewmodels.ViewRule{SafeRule: data.SafeRule, QualityRule: data.QualityRule, ContractPaidRule: data.ContractPaidRule, ContractReturnRule: data.ContractReturnRule}
-=======
-	viewData := viewmodels.ViewRule{SafeRule: data.SafeRule, QualityRule: data.QualityRule, ContractReturnRule: data.ContractReturnRule, ContractPaidRule: data.ContractPaidRule}
->>>>>>> Stashed changes
 	return viewData
 }