Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_back into dev

src/main/java/com/izouma/nineth/web/AgreementController.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.web;
 
 import com.izouma.nineth.config.GeneralProperties;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -19,6 +20,15 @@ public class AgreementController {
         return  "Privacy";
     }
 
+    @GetMapping("/privacy1.html")
+    public String privacy1(Model model) {
+        GeneralProperties p = new GeneralProperties();
+        BeanUtils.copyProperties(generalProperties, p);
+        p.setName("RAEX绿洲");
+        model.addAttribute("properties", generalProperties);
+        return  "Privacy";
+    }
+
     @GetMapping("/service.html")
     public String service(Model model) {
         model.addAttribute("properties", generalProperties);