Merge branch 'master' of http://gitlab.scsmile.cn/zxf/enterprise-platform

enterprise-manager/src/main/java/com/mortals/xhx/module/product/web/ProductController.java

@@ -80,7 +80,7 @@ public class ProductController extends BaseCRUDJsonBodyMappingController<Product
     @Override
     protected int editAfter(Long id, Map<String, Object> model, ProductEntity entity, Context context) throws AppException {
         String categoryIds = productCategoryService.find(new ProductCategoryQuery().productId(entity.getId())).stream().map(i -> i.getCategoryId().toString()).collect(Collectors.joining(","));
-        String companyIds = companyProductService.find(new CompanyProductQuery().productId(entity.getId())).stream().map(i -> i.getProductId().toString()).collect(Collectors.joining(","));
+        String companyIds = companyProductService.find(new CompanyProductQuery().productId(entity.getId())).stream().map(i -> i.getCompanyId().toString()).collect(Collectors.joining(","));
 
         if (!ObjectUtils.isEmpty(categoryIds)) {
             entity.setCategoryId(categoryIds);