Merge remote-tracking branch 'origin/master'

fengxiang

2018-04-25 f74fd7281a4d6b0176692078052a6281eaafcc41

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