From 688ef1c29f768a336ec73d7234d25da1ca7aef9c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 10 十一月 2022 10:43:09 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java
index 181be35..f8de9d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java
@@ -3,11 +3,11 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopFlowerStoreDTO;
 import com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO;
-import com.panzhihua.common.model.vos.shop.ComShopGoodsVO;
 import com.panzhihua.common.model.vos.shop.PageShopFlowerGoodsVO;
-import com.panzhihua.common.model.vos.shop.PageShopGoodsVO;
 import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

--
Gitblit v1.7.1