From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' 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