Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

 screen-api/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java

@@ -1,7 +1,11 @@
package com.moral.api.mapper;

import com.moral.api.entity.SysDictData;
import com.moral.api.entity.SysDictType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +17,5 @@
 */
public interface SysDictTypeMapper extends BaseMapper<SysDictType> {

    List<SysDictData> selectCodeList(@Param("code") String code, @Param("id") String id);
}