Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-01 cc623a1a25fe1861fbeaba79a76bfc29724141f9

 ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml

@@ -35,7 +35,7 @@
            <if test="deptId != null "> and tcs.dept_id = #{deptId}</if>
            ${params.dataScope}
        </where>
        order by createTime desc;
        order by create_time desc;
    </select>

    <select id="selectCheckScoreById" parameterType="Long" resultMap="CheckScoreResult">