Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

mg

2022-10-14 b9e7a0261443ca41b80108b9fef555093f20bb8b

 ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.vo.ViolationSettingVO;

/**
 * <p>
@@ -16,5 +17,5 @@

    Page<DataDictionary> listDataDictionaryPage(Page<DataDictionary> dataDictionaryPage, String keyWord);

    Page<DataDictionary> listViolationPage(Page<DataDictionary> dataDictionaryPage, String keyWord);
    Page<ViolationSettingVO> listViolationPage(Page<ViolationSettingVO> dataDictionaryPage, String keyWord);
}