From 1fbd4413550ebe1b7f7a91f61bffaeb77dc23959 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 14:11:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java
index a0c350b..b46d23d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java
@@ -45,27 +45,29 @@
" </where>" +
" order by c.create_at desc" +
"</script>")
- IPage<PageShopGoodsVO> pageShopGoods(Page page, @Param("pageComShopGoodsDTO") PageComShopGoodsDTO pageComShopGoodsDTO);
+ IPage<PageShopGoodsVO> pageShopGoods(Page page, @Param("pageComShopGoodsDTO") PageComShopGoodsDTO pageComShopGoodsDTO);
/**
* 根据店铺id查询商品列表
- * @param page 分页参数
- * @param pageComShopStoreDTO 请求参数
- * @return 分页商品列表
+ *
+ * @param page 分页参数
+ * @param pageComShopStoreDTO 请求参数
+ * @return 分页商品列表
*/
@Select("<script> " +
"select id,`name`,store_id,goods_pic,images,`status`,sale,original_price,price" +
",unit,`order`,stock,details,delivery_type from com_shop_goods" +
" where store_id = #{pageComShopStoreDTO.storeId} and delete_status = 1 and status = 1" +
- " order by sale desc,create_at desc "+
+ " order by sale desc,create_at desc " +
"</script> ")
IPage<ComShopGoodsVO> pageShopGoodsByStoreId(Page page, @Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO);
/**
* 分页查询商品列表
- * @param page 分页参数
- * @param comShopGoodsDTO 请求参数
- * @return 商品列表
+ *
+ * @param page 分页参数
+ * @param comShopGoodsDTO 请求参数
+ * @return 商品列表
*/
@Select("<script> " +
"select csg.id,csg.`name`,csg.store_id,csg.goods_pic,csg.images,csg.`status`,csg.sale,csg.original_price " +
@@ -91,5 +93,4 @@
" order by sale desc,create_at desc " +
" </script>")
IPage<ComShopGoodsVO> pageShopGoodByApps(Page page, @Param("comShopGoodsDTO") ComShopGoodsDTO comShopGoodsDTO);
-
}
--
Gitblit v1.7.1