From aa1d5a202c119488b66a3a4b25cf209c617b2f38 Mon Sep 17 00:00:00 2001 From: lzttt <1803073139@qq.com> Date: Thu, 10 Oct 2024 16:14:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=BE=E7=BD=AE=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=8F=AF=E6=8C=82=E8=B4=A6=EF=BC=88=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iocoder/yudao/module/custom/entity/CustomerMain.java | 7 ++++++- .../main/resources/mapper/custom/CustomerMainMapper.xml | 5 ++++- .../base/controller/admin/RepairRecordsController.java | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java index 417179ba..e5279f05 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java @@ -106,4 +106,9 @@ public class CustomerMain extends TenantBaseDO { */ private String memberLevelId; -} \ No newline at end of file + /** + * 是否挂账 + */ + private String isHangAccount; + +} diff --git a/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml b/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml index f7010d02..80311869 100644 --- a/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml +++ b/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml @@ -34,6 +34,7 @@ main.near_do_time AS nearDoTime, main.near_do_content AS nearDoContent, main.inviter AS inviter, + main.is_hang_account AS isHangAccount, main.inviter_type AS inviterType, main.status AS status, group_concat(item.ser_content) AS serContents, @@ -102,6 +103,8 @@ main.near_do_content AS nearDoContent, main.inviter AS inviter, main.inviter_type AS inviterType, + main.member_level_id AS memberLevelId, + main.is_hang_account AS isHangAccount, main.STATUS AS STATUS, group_concat( item.ser_content ) AS serContents, memberLevel.NAME AS levelName, @@ -131,4 +134,4 @@ where bcc.deleted = '0' and bcc.car_id = #{carId} - \ No newline at end of file + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairRecordsController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairRecordsController.java index 4ce74ca3..51ad4323 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairRecordsController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairRecordsController.java @@ -61,7 +61,7 @@ public class RepairRecordsController { /** * 维修工查询维修记录 - * @param pageReqVO 维修工分页查询条件 + * @param pageReqVO * */ @GetMapping("/page")