From 92f1d85ddc449ce7452f9d52f8b081e6b69c720b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:29:08 +0800
Subject: [PATCH] update .gitignore

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java |  108 +++++++++++++++++++++++++++---------------------------
 1 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java
index 878bd8c..ae85781 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/MergeClassService.java
@@ -1,54 +1,54 @@
-package com.yeshi.fanli.service.inter.lable;
-
-
-
-import org.springframework.cache.annotation.Cacheable;
-
-import com.yeshi.fanli.entity.bus.lable.MergeClass;
-import com.yeshi.fanli.exception.goods.MergeClassException;
-
-public interface MergeClassService {
-	
-	/**
-	 * 鎻掑叆瀵硅薄
-	 * @param record
-	 * @return
-	 * @throws MergeClassException
-	 */
-	public int insert(MergeClass record) throws MergeClassException;
-	
-	/**
-	 * 鏇存柊褰撳墠瀵硅薄鎵�鏈夋暟鎹�
-	 * @param record
-	 * @return
-	 * @throws MergeClassException
-	 */
-	public int updateByPrimaryKey(MergeClass record) throws MergeClassException;
-	
-	/**
-	 * 閫夋嫨鎬ф洿鏂板唴瀹光�斺�斾笉涓虹┖鍒欐洿鏂拌瀛楁
-	 * @param record
-	 * @return
-	 * @throws MergeClassException
-	 */
-	public int updateByPrimaryKeySelective(MergeClass record) throws MergeClassException;
-	
-	/**
-	 * 鏍规嵁id鍒犻櫎褰撳墠瀵硅薄
-	 * @param id
-	 * @return
-	 * @throws MergeClassException
-	 */
-	public int deleteByPrimaryKey(Long id) throws MergeClassException;
-
-	
-	/**
-	 * 鏍规嵁id鏌ユ壘褰撳墠瀵硅薄
-	 * @param id
-	 * @return
-	 * @throws MergeClassException
-	 */
-	public MergeClass selectByPrimaryKeyCache(Long id) throws MergeClassException;
-
-	public MergeClass selectByPrimaryKey(Long id) throws MergeClassException;
-}
+package com.yeshi.fanli.service.inter.lable;
+
+
+
+import org.springframework.cache.annotation.Cacheable;
+
+import com.yeshi.fanli.entity.bus.lable.MergeClass;
+import com.yeshi.fanli.exception.goods.MergeClassException;
+
+public interface MergeClassService {
+	
+	/**
+	 * 鎻掑叆瀵硅薄
+	 * @param record
+	 * @return
+	 * @throws MergeClassException
+	 */
+	public int insert(MergeClass record) throws MergeClassException;
+	
+	/**
+	 * 鏇存柊褰撳墠瀵硅薄鎵�鏈夋暟鎹�
+	 * @param record
+	 * @return
+	 * @throws MergeClassException
+	 */
+	public int updateByPrimaryKey(MergeClass record) throws MergeClassException;
+	
+	/**
+	 * 閫夋嫨鎬ф洿鏂板唴瀹光�斺�斾笉涓虹┖鍒欐洿鏂拌瀛楁
+	 * @param record
+	 * @return
+	 * @throws MergeClassException
+	 */
+	public int updateByPrimaryKeySelective(MergeClass record) throws MergeClassException;
+	
+	/**
+	 * 鏍规嵁id鍒犻櫎褰撳墠瀵硅薄
+	 * @param id
+	 * @return
+	 * @throws MergeClassException
+	 */
+	public int deleteByPrimaryKey(Long id) throws MergeClassException;
+
+	
+	/**
+	 * 鏍规嵁id鏌ユ壘褰撳墠瀵硅薄
+	 * @param id
+	 * @return
+	 * @throws MergeClassException
+	 */
+	public MergeClass selectByPrimaryKeyCache(Long id) throws MergeClassException;
+
+	public MergeClass selectByPrimaryKey(Long id) throws MergeClassException;
+}

--
Gitblit v1.8.0