Merge remote-tracking branch 'origin/dev-optimize-2.3.0'

src/main/java/com/ost/micro/provider/controller/CompanyController.java

@@ -52,12 +52,12 @@ public class CompanyController {
             @ApiImplicitParam(paramType = "query", name = "is_entry_info_admin", value = "是否是资质录入员admin", required = false, dataType = "int"),
             @ApiImplicitParam(paramType = "query", name = "biz_id", value = "商家id", required = false, dataType = "Long"),
             @ApiImplicitParam(paramType = "query", name = "biz_ids", value = "商家id列表", required = false, dataType = "List"),
-            @ApiImplicitParam(paramType = "query", name = "enable", value = "启用状态", required = false, dataType = "int"),
+            @ApiImplicitParam(paramType = "query", name = "status", value = "启用状态", required = false, dataType = "int"),
             @ApiImplicitParam(paramType = "query", name = "page_index", value = "页码", required = true, dataType = "int"),
             @ApiImplicitParam(paramType = "query", name = "page_size", value = "每页数码条数", required = true, dataType = "int")})
     @DataToUnderline()
     public DataResponse search(@RequestParam(required = false) String keyword,
-                               @RequestParam(required = false) Integer enable,
+                               @RequestParam(required = false) Integer status,
                                @RequestParam(required = false, name = "is_entry_info") Integer isEntryInfo,
                                @RequestParam(required = false, name = "is_entry_info_admin") Integer isEntryInfoAdmin,
                                @RequestParam(required = false, name = "biz_id") Long bizId,
@@ -72,11 +72,11 @@ public class CompanyController {
         urlBuilder.append("&isEntryInfoAdmin={isEntryInfoAdmin}");
         urlBuilder.append("&bizId={bizId}");
         urlBuilder.append("&bizIds={bizIds}");
-        urlBuilder.append("&enable={enable}");
+        urlBuilder.append("&status={status}");
         urlBuilder.append("&pageIndex={pageIndex}");
         urlBuilder.append("&pageSize={pageSize}");
         ResponseEntity<DataResponse> result = paymentServiceClient.getRestTemplate()
-                .getForEntity(urlBuilder.toString(), DataResponse.class, keyword, isEntryInfo,isEntryInfoAdmin, bizId, bizIds, enable, pageIndex, pageSize);
+                .getForEntity(urlBuilder.toString(), DataResponse.class, keyword, isEntryInfo,isEntryInfoAdmin, bizId, bizIds, status, pageIndex, pageSize);
 
         return result.getBody();
     }
@@ -86,6 +86,7 @@ public class CompanyController {
     @DataToUnderline()
     //public DataResponse add(@RequestBody AddCompanyForm addCompanyForm) {
     public DataResponse add(@RequestBody BizSignCompExtDto addCompanyForm) {
+        addCompanyForm.setSource(1);
         StringBuilder urlBuilder = new StringBuilder();
         urlBuilder.append(serviceUrl.getAsServiceUrl(consulDiscoveryClient));
         urlBuilder.append(BASE_URL);