Merge branch 'dev-zrj' into 'staging'

proxyport

See merge request !35

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

@@ -41,7 +41,7 @@ public class IpResource implements Serializable {
     private String proxyUsername;
     private String proxyPassword;
     private String proxyprotocol;
-    private String proxyport;
+    private List<String> proxyport;
 
     private String shopId;
     private String shopName;
@@ -287,11 +287,11 @@ public class IpResource implements Serializable {
         this.specialLine = specialLine;
     }
 
-    public String getProxyport() {
+    public List<String> getProxyport() {
         return proxyport;
     }
 
-    public void setProxyport(String proxyport) {
+    public void setProxyport(List<String> proxyport) {
         this.proxyport = proxyport;
     }
 

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

@@ -29,7 +29,7 @@ public class IpResourceDto {
     private String proxyUsername;
     private String proxyPassword;
     private String proxyprotocol;
-    private String proxyport;
+    private List<String> proxyport;
 
     public IpResourceDto(){
     }
@@ -195,11 +195,11 @@ public class IpResourceDto {
         this.specialLine = specialLine;
     }
 
-    public String getProxyport() {
+    public List<String> getProxyport() {
         return proxyport;
     }
 
-    public void setProxyport(String proxyport) {
+    public void setProxyport(List<String> proxyport) {
         this.proxyport = proxyport;
     }