From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSecondClassMapper.java |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSecondClassMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSecondClassMapper.java
index 74dd530..5d9e948 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSecondClassMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSecondClassMapper.java
@@ -1,31 +1,31 @@
-package com.yeshi.fanli.dao.mybatis;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;
-
-public interface GoodsSecondClassMapper extends BaseMapper<GoodsSecondClass>{
-	
-	/**
-	 * 鏍规嵁涓婄骇鍒嗙被ID鏌ヨ
-	 * @param pid
-	 * @return
-	 */
-	List<GoodsSecondClass> getByGoodsClassId(@Param("pid") Long pid);
-	
-	/**
-	 * 鏍规嵁涓婄骇鍒嗙被ID鏌ヨ
-	 * @param pid
-	 * @return
-	 */
-	List<GoodsSecondClass> getByNameAndGoodsClassId(@Param("start") long start, @Param("count") int count, 
-			@Param("pid") Long pid, @Param("name") String name);
-	
-	
-	int countByNameAndGoodsClassId(@Param("pid") Long pid, @Param("name") String name);
-	
-	
+package com.yeshi.fanli.dao.mybatis;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;
+
+public interface GoodsSecondClassMapper extends BaseMapper<GoodsSecondClass>{
+	
+	/**
+	 * 鏍规嵁涓婄骇鍒嗙被ID鏌ヨ
+	 * @param pid
+	 * @return
+	 */
+	List<GoodsSecondClass> getByGoodsClassId(@Param("pid") Long pid);
+	
+	/**
+	 * 鏍规嵁涓婄骇鍒嗙被ID鏌ヨ
+	 * @param pid
+	 * @return
+	 */
+	List<GoodsSecondClass> getByNameAndGoodsClassId(@Param("start") long start, @Param("count") int count, 
+			@Param("pid") Long pid, @Param("name") String name);
+	
+	
+	int countByNameAndGoodsClassId(@Param("pid") Long pid, @Param("name") String name);
+	
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0