Parcourir la source

Merge branch 'share_seller' into debug

# Conflicts:
#	controllers/company.go
zwxi il y a 1 an
Parent
commit
57baaf7244
1 fichiers modifiés avec 2 ajouts et 0 suppressions
  1. 2 0
      controllers/company.go

+ 2 - 0
controllers/company.go

@@ -1752,6 +1752,8 @@ func (this *CompanyController) List() {
 				CloseReason:         v.CloseReason,
 				IsSigning:           v.IsSigning,
 				CompanyStatusButton: v.CompanyStatusButton,
+				ShareSeller:     v.ShareSeller,
+				ShareSellerId:   v.ShareSellerId,
 			}
 			companyLists = append(companyLists, companyList)
 		}