Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-31 455498f1454449bfd127a560eeb01ffff823a6ca

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

@@ -2,7 +2,8 @@

import com.moral.common.mapper.BaseMapper;
import com.moral.entity.DictionaryData;
import org.apache.ibatis.annotations.Param;

public interface DictionaryDataMapper extends BaseMapper<DictionaryData> {
//    DictionaryData selectByPrimaryKey(Integer id);
    public  Integer selectSupperOrgId();
}