Merge branch 'dev-zrj' into 'staging'

注释

See merge request !143

src/main/java/com/edgec/browserbackend/account/domain/Promotion.java

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Promotion {
     private String code;
+    //邀请人数
     private int invitedUsers;
     //好友本月以前总消费
     private int totalCommission;
@@ -17,7 +18,9 @@ public class Promotion {
     private int commission;
     //好友上月总消费
     private int commissionLastMonth;
+    //是否是本公司的销售
     private boolean isSale;
+    //当月礼金
     private double gift;
     //所有未提现金额
     private double allGift;

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

@@ -10,6 +10,7 @@ import org.elasticsearch.client.license.LicensesStatus;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Stack;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ShopResultDto {

src/main/java/com/edgec/browserbackend/browser/task/Set3proxyTask.java

@@ -64,6 +64,7 @@ public class Set3proxyTask {
             FileWriter fileWriter =new FileWriter(file, true);
             BufferedWriter bw = new BufferedWriter(fileWriter);
             bw.write("daemon\nlog /var/log/3proxy.log D\nrotate 30\n");
+            bw.write("maxconn 10000\n");
             bw.write("config /root/3proxy.cfg\n");
             bw.write("monitor /root/3proxy.cfg\n");