From 171f5567cecda191f6b32e6c303c2bea9cd266f0 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Tue, 01 Sep 2020 19:47:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/SysProductMapper.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/SysProductMapper.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/SysProductMapper.java
index 6721655..bef3be5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/SysProductMapper.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/SysProductMapper.java
@@ -1,8 +1,9 @@
 package com.kidgrow.oprationcenter.mapper;
 
-import com.kidgrow.oprationcenter.model.SysProduct;
-import com.kidgrow.db.mapper.SuperMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kidgrow.db.mapper.SuperMapper;
+import com.kidgrow.oprationcenter.model.SysProduct;
+import com.kidgrow.oprationcenter.vo.ProductAllVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -24,6 +25,7 @@
      * @return
      */
     List<SysProduct> findList(Page<SysProduct> page, @Param("p") Map<String, Object> params);
+    List<ProductAllVo> findAllList(@Param("p") Map<String, Object> params);
 
     /**
      * 根据SysProduct对象当做查询条件进行查询

--
Gitblit v1.8.0