Merge remote-tracking branch 'origin/master'

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/CompanyController.java

@@ -51,9 +51,18 @@ public class CompanyController {
 
             if(company!=null) {
                 PojoUtils.map(company, companyInfoDTO);
+
+                if(StringUtils.isNotEmpty(company.getPromoter())){
+                    companyInfoDTO.setPromoterEnabled(false);
+                }
+                else{
+                    companyInfoDTO.setPromoterEnabled(true);
+                }
+
                 messageResult.setData(companyInfoDTO);
             }
             else{
+                companyInfoDTO.setPromoterEnabled(true);
                 messageResult.setData(companyInfoDTO);
             }
 

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/dto/CompanyInfoDTO.java

@@ -39,4 +39,10 @@ public class CompanyInfoDTO {
     private String address;
     @ApiModelProperty(value = "邮政编号")
     private String postal;
+    @ApiModelProperty(value = "雇员人数")
+    private Integer employeesNumber;
+    @ApiModelProperty(value = "推广员账号")
+    private String promoter;
+    @ApiModelProperty(value = "是否允许修改推广员账号")
+    private Boolean promoterEnabled;
 }