#74 -- fix merge
This commit is contained in:
parent
12c28b9ba0
commit
591f183e8b
@ -11,7 +11,7 @@ public class AddRuleForm {
|
||||
public AddRuleForm() {
|
||||
}
|
||||
|
||||
public AddRuleForm(Rule rule) {
|
||||
public AddRuleForm(DbRule rule) {
|
||||
this.ruleId = rule.getId();
|
||||
this.firstAntecedentId = rule.getFirstAntecedent().name();
|
||||
this.secondAntecedentId = rule.getSecondAntecedent().name();
|
||||
|
@ -45,7 +45,7 @@ public class RuleService {
|
||||
}
|
||||
}
|
||||
|
||||
public Rule findById(Integer id) {
|
||||
public DbRule findById(Integer id) {
|
||||
return ruleRepository.getOne(id);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user