Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

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