Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-02 539a7077cbf638a5aa9ae5e46c17be96daba7d9b

 src/main/java/com/moral/mapper/DictionaryMapper.java

@@ -4,5 +4,4 @@
import com.moral.entity.Dictionary;

public interface DictionaryMapper extends BaseMapper<Dictionary> {
    Dictionary selectByPrimaryKey(String dictName);
}