From 1e228c1191996a8e704cf36dc8042b1c6ca81ef1 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 04 Nov 2020 10:59:05 +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 | 8 +++++---
1 files changed, 5 insertions(+), 3 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 b8c87a7..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,11 +25,12 @@
* @return
*/
List<SysProduct> findList(Page<SysProduct> page, @Param("p") Map<String, Object> params);
+ List<ProductAllVo> findAllList(@Param("p") Map<String, Object> params);
/**
* 根据SysProduct对象当做查询条件进行查询
* @param
* @return SysProduct对象
*/
- SysProduct findByObject(SysProduct sysProduct);
+ SysProduct findByObject(@Param("p") SysProduct sysProduct);
}
--
Gitblit v1.8.0