From 3d9b49dc4cf7f55a99683bd42d3313060c4bd5f6 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 20 十月 2023 14:10:18 +0800
Subject: [PATCH] 修改商家列表  详情没有分类名称

---
 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml                          |    2 ++
 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java |    4 ++++
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java           |    2 ++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
index 2571e93..851ab0f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
@@ -76,6 +76,8 @@
     @ApiModelProperty("商家类型id")
     private String convenientType;
 
+    @ApiModelProperty("商家类型名称")
+    private String convenientName;
 
     @ApiModelProperty("商家图片")
     private String imgUrl;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java
index 42b49d9..f12450e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java
@@ -79,6 +79,10 @@
     @ApiModelProperty("商家类型id")
     private String convenientType;
 
+    @TableField(exist = false)
+    @ApiModelProperty("商家类型名称")
+    private String convenientName;
+
 
     @ApiModelProperty("商家图片")
     private String imgUrl;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml
index 8e3b70b..6d82d39 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml
@@ -62,6 +62,7 @@
             created_by,
             updated_at,
             convenient_type,
+            (select jccsc.name from jinhui_com_convenient_service_categories as jccsc where jccsc.id=ccm.convenient_type) as convenientName,
             audit_type,
             audit_opinion,
             img_url
@@ -96,6 +97,7 @@
             created_by,
             updated_at,
             convenient_type,
+            (select jccsc.name from jinhui_com_convenient_service_categories as jccsc where jccsc.id=ccm.convenient_type) as convenientName,
             audit_type,
             audit_opinion,
             img_url

--
Gitblit v1.7.1