Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-31 455498f1454449bfd127a560eeb01ffff823a6ca

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