diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java index c20202584f..acec8f4fde 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java @@ -100,4 +100,5 @@ public class AsBusreserveBill extends BaseEntity { private String subjectSid; @ApiModelProperty("科目") private String subject; + private String customerVehicleSid; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java index a169fbcbb8..ac58b8b1ef 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java @@ -79,6 +79,7 @@ public class AsBusreserveBillDto implements Dto { private String customerSid; // 客户sid @ApiModelProperty("客户名称") private String customerName; // 客户名称 + private String customerVehicleSid; // 客户名称 @ApiModelProperty("联系电话") private String mobile; // 联系电话 @ApiModelProperty("车牌号") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java index 95ba26591b..88995e33cf 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java @@ -407,6 +407,9 @@ public class AsBusreserveBillService extends MybatisBaseService> asListPage(PagerQuery pq) { + public ResultBean> asListPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); PagerVo pv = crmCustomerService.asListPage(pq); return rb.success().setData(pv); diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java index a4164ce762..e44ae720f8 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerDto.java @@ -171,4 +171,6 @@ public class CrmCustomerDto implements Dto { private String vehState; private String saleOrgName; private String saleDate; + private String sid; + } diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java index 0ff1addd01..60a7b3cf94 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java @@ -618,7 +618,7 @@ public class CrmCustomerService extends MybatisBaseService