From 2eec2f4303c60d94323f19429ff9cce58f132978 Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Mon, 7 Apr 2025 18:15:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=BA=97=E9=93=BA=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/account/dto/ShopBranchDTO.java | 4 ++++ .../src/main/resources/mapper/ShopConfigMapper.xml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopBranchDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopBranchDTO.java index 465cedae..3a583cbe 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopBranchDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopBranchDTO.java @@ -23,6 +23,10 @@ public class ShopBranchDTO implements Serializable { * 店铺名称 */ private String shopName; + /** + * 店铺类型 单店--only 连锁店--chain--加盟店join （对应原来 type） + */ + private String shopType; /** * 账号 */ diff --git a/cash-service/account-service/src/main/resources/mapper/ShopConfigMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopConfigMapper.xml index d5c6a632..875c7f62 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopConfigMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopConfigMapper.xml @@ -7,7 +7,8 @@ select t1.*, t2.shop_name, t2.phone, - t3.account + t3.account, + t2.shop_type from tb_shop_config t1 left join tb_shop_info t2 on t1.id = t2.id left join sys_user t3 on t1.id = t3.id