Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-05-13 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbProjectMapper.xml

@@ -67,7 +67,7 @@
        <if test="vo.endTime!=null and vo.endTime!=''">
            and tb."check_date" &lt;= #{vo.endTime}
        </if>

        order by city_code,county_code asc
    </select>

    <resultMap id="dto" type="cn.gistack.sm.sjztmd.dto.TbProjectDTO">