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

cjl

2023-10-20 a3eaa78c6d839b640c728f4c7d8eb27732627b07

 screen-manage/src/main/resources/mapper/SysDictTypeMapper.xml

@@ -12,4 +12,18 @@
                    <result column="is_delete" property="isDelete" />
        </resultMap>

    <select id="listOne" resultType="com.moral.api.entity.SysDictType">
        SELECT
            t.id,
            t.name,
            t.desc,
            t.system,
            t.create_time,
            t.update_time,
            t.is_delete
        FROM
            sys_dict_type t
        WHERE
            t.name =#{name}  AND is_delete = '0'
    </select>
</mapper>