Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

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