Merge remote-tracking branch 'origin/master'

zhangfeng

2023-07-24 50304934a7a677800e94f15b0dd3f3b788a704ef

 src/main/java/com/gk/hotwork/Mapper/DictionaryItemInfoMapper.java

@@ -25,7 +25,7 @@

    int updateByPrimaryKey(DictionaryItemInfo record);

    List<DictionaryItemInfo> selectDataGrid(Page<DictionaryItemInfo> page, Map<String, Object> condition);
    List<DictionaryItemInfo> selectDataGrid(@Param("page")  Page<DictionaryItemInfo> page,@Param("condition") Map<String, Object> condition);

    List<DictionaryTypeInfo> selectExistInfo(@Param("id") Long id,@Param("value") String value,@Param("text") String text);