diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java index e46e2dcc..0db7b0b0 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java @@ -50,8 +50,4 @@ public class SupplierBankInfo extends BaseEntity { @ApiModelProperty("锁定原因") private String lockingReason; - /* @ApiModelProperty("营业执照附件") - private String businessLicenseFiles; // 营业执照附件*/ - /* @ApiModelProperty("合同信息") - private SupplierContractInfoDto supplierContractInfoDto; // 合同信息*/ } diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java index 2dc5450e..c5193249 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoDto.java @@ -70,7 +70,7 @@ public class SupplierBankInfoDto implements Dto { @ApiModelProperty("法人") private String legalRepresentative; // 法人 @ApiModelProperty("营业执照号") - private String businessLicenseNo; // 营业执照号 + private String businessLicenseNo; // businessLicenseFiles营业执照号 @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝") private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝 @ApiModelProperty("监管审批意见") diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java index 063d9cec..c4e42c52 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfoFeign.java @@ -50,7 +50,7 @@ import org.springframework.web.bind.annotation.*; @FeignClient( contextId = "supervise-SupplierBankInfo", name = "supervise", - path = "v1/supplierbankinfo", + path = "v1/supplier", fallback = SupplierBankInfoFeignFallback.class) public interface SupplierBankInfoFeign { @@ -60,7 +60,7 @@ public interface SupplierBankInfoFeign { public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("新增或修改") - @PostMapping("/save") + @PostMapping("/saveSupplier") @ResponseBody public ResultBean save(@RequestBody SupplierBankInfoDto dto); diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml index 850d36f9..f4486602 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml @@ -21,7 +21,7 @@ spring: request-timeout: 20000 server: - port: 7003 + port: 7005 max-http-header-size: 102400 tomcat: max-http-form-post-size: -1 diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml index fc2d0a76..3fbea283 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml @@ -3,7 +3,8 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true username: root - password: 1LAiGz$t1*Iw + #password: 1LAiGz$t1*Iw + password: root` # cloud: # nacos: # discovery: diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-test.yml index f71a2175..a1f787ef 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-test.yml @@ -4,7 +4,8 @@ spring: # url: jdbc:mysql://122.14.222.186:3306/supervise_rms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true url: jdbc:mysql://127.0.0.1:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: 1LAiGz$t1*Iw + #password: 1LAiGz$t1*Iw + password: root cloud: nacos: discovery: