Merge branch 'dev-zrj' into 'staging'

专线bug

See merge request !40

src/main/java/com/edgec/browserbackend/browser/domain/IpResource.java

@@ -40,7 +40,7 @@ public class IpResource implements Serializable {
     //专线数据
     private String proxyUsername;
     private String proxyPassword;
-    private String proxyProtocol;
+    private List<String> proxyProtocol;
     private List<String> proxyPort;
 
     private String shopId;
@@ -295,11 +295,11 @@ public class IpResource implements Serializable {
         this.proxyPort = proxyPort;
     }
 
-    public String getProxyProtocol() {
+    public List<String> getProxyProtocol() {
         return proxyProtocol;
     }
 
-    public void setProxyProtocol(String proxyProtocol) {
+    public void setProxyProtocol(List<String> proxyProtocol) {
         this.proxyProtocol = proxyProtocol;
     }
 }

src/main/java/com/edgec/browserbackend/browser/dto/IpResourceDto.java

@@ -28,7 +28,7 @@ public class IpResourceDto {
     //专线数据
     private String proxyUsername;
     private String proxyPassword;
-    private String proxyProtocol;
+    private List<String> proxyProtocol;
     private List<String> proxyPort;
 
     private String speicalLineIp;
@@ -223,14 +223,22 @@ public class IpResourceDto {
         this.specialLine = specialLine;
     }
 
-    public String getProxyProtocol() {
+    public List<String> getProxyProtocol() {
         return proxyProtocol;
     }
 
-    public void setProxyProtocol(String proxyProtocol) {
+    public void setProxyProtocol(List<String> proxyProtocol) {
         this.proxyProtocol = proxyProtocol;
     }
 
+    public String getSpeicalLineIp() {
+        return speicalLineIp;
+    }
+
+    public void setSpeicalLineIp(String speicalLineIp) {
+        this.speicalLineIp = speicalLineIp;
+    }
+
     public List<String> getProxyPort() {
         return proxyPort;
     }