Merge remote-tracking branch 'origin/master'

zzw

2023-11-20 2c89ccdc9e008060f8cd6608c9fcb014616987a3

 modules/mainPart/src/main/resources/mapper/sysBaseInfo/TestAgencyInfoDao.xml

@@ -7,10 +7,7 @@
        select a.*
        from test_agency_info a
        <where>
            a.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            </if>
            a.is_delete = 0 and a.ID = 10000
        </where>
        <if test="orderBySql!=null">
            ORDER BY ${orderBySql}