Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-22 d10235124e675103c1a27fb5aeff337493413cc2

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