From 6688e50ba02988d742baadaca156a303a90b6191 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Apr 2018 14:03:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/DictionaryMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DictionaryMapper.java b/src/main/java/com/moral/mapper/DictionaryMapper.java
index 52a8429..6ae4aa0 100644
--- a/src/main/java/com/moral/mapper/DictionaryMapper.java
+++ b/src/main/java/com/moral/mapper/DictionaryMapper.java
@@ -4,5 +4,5 @@
import com.moral.entity.Dictionary;
public interface DictionaryMapper extends BaseMapper<Dictionary> {
- Dictionary selectByPrimaryKey(String dictName);
+// Dictionary selectByPrimaryKey(String dictName);
}
\ No newline at end of file
--
Gitblit v1.8.0