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

shenyijian

2024-06-13 502a46d9f79f3a2e6ba8bf8c90b71c0c8ebf4815

 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
        order by CAST(city_code AS number) asc,CAST(county_code AS number) asc,CAST(guid AS number) desc
    </select>

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