Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-webapp-plug into developer

src/main/java/com/gic/plug/web/controller/goods/AppletConfigGoodsController.java

@@ -215,10 +215,11 @@ public class AppletConfigGoodsController extends BaseGoodsController {
         } else if (Constant.CHANNEL_CODE_ERP.equals(channelCode)) {
             searchCode = "erp_goods";
         }
-        String esName = esScreeningSearchService.getCurrentEsName("1129", searchCode);
+        String enterpriseId = getEnterpriseId() + "";
+        String esName = esScreeningSearchService.getCurrentEsName(enterpriseId, searchCode);
         searchDTO.setIndexName(esName);
         searchDTO.setColumnCategoryCode(searchCode);
-        searchDTO.setEnterpriseId("1129");
+        searchDTO.setEnterpriseId(enterpriseId);
         searchDTO.setType("mapper_type");
         searchDTO.setBegin((currentPage - 1) * pageSize);
         searchDTO.setRecordNumber(pageSize);