|
|
@@ -20,7 +20,7 @@ public class AgreementController {
|
|
|
BeanUtils.copyProperties(generalProperties, p);
|
|
|
p.setName("無限綠洲");
|
|
|
model.addAttribute("properties", p);
|
|
|
- return "Privacy";
|
|
|
+ return "Privacy";
|
|
|
}
|
|
|
|
|
|
@GetMapping("/privacy1.html")
|
|
|
@@ -29,12 +29,16 @@ public class AgreementController {
|
|
|
BeanUtils.copyProperties(generalProperties, p);
|
|
|
p.setName("無限綠洲");
|
|
|
model.addAttribute("properties", p);
|
|
|
- return "Privacy";
|
|
|
+ return "Privacy";
|
|
|
}
|
|
|
|
|
|
@GetMapping("/service.html")
|
|
|
public String service(Model model) {
|
|
|
- model.addAttribute("properties", generalProperties);
|
|
|
- return "Service";
|
|
|
+ GeneralProperties p = new GeneralProperties();
|
|
|
+ BeanUtils.copyProperties(generalProperties, p);
|
|
|
+ p.setName("無限綠洲");
|
|
|
+ p.setShortName("無限綠洲");
|
|
|
+ model.addAttribute("properties", p);
|
|
|
+ return "Service";
|
|
|
}
|
|
|
}
|