From 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 01 Jun 2018 14:58:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/DictionaryDataMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DictionaryDataMapper.java b/src/main/java/com/moral/mapper/DictionaryDataMapper.java
index 4c5a3c3..038a4be 100644
--- a/src/main/java/com/moral/mapper/DictionaryDataMapper.java
+++ b/src/main/java/com/moral/mapper/DictionaryDataMapper.java
@@ -4,5 +4,5 @@
import com.moral.entity.DictionaryData;
public interface DictionaryDataMapper extends BaseMapper<DictionaryData> {
- DictionaryData selectByPrimaryKey(Integer id);
+// DictionaryData selectByPrimaryKey(Integer id);
}
\ No newline at end of file
--
Gitblit v1.8.0