Merge remote-tracking branch 'origin/master'

fengxiang

2018-04-25 f74fd7281a4d6b0176692078052a6281eaafcc41

 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);
}