From a9fac3d1e2fdba55d61196cc14377c48c66e6daf Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 27 四月 2021 10:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
index be98806..c4efcb1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
@@ -20,7 +20,7 @@
@Select("<script>" +
"select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`," +
- "sale,sale_volume,store_detail,create_at from com_shop_store c" +
+ "sale,sale_volume,store_detail,create_at, store_describe from com_shop_store c" +
" <where>" +
"c.delete_status=1 and c.status = 1" +
"<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != ""'>" +
@@ -45,7 +45,7 @@
@Select("<script>" +
"select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`," +
- "sale,sale_volume,store_detail,create_at from com_shop_store c" +
+ "sale,sale_volume,store_detail,create_at,store_describe from com_shop_store c" +
" <where>" +
" and c.delete_status=1 " +
"<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != ""'>" +
--
Gitblit v1.7.1