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

b87b80c2 · 朱晨阳 · 01317c76 · 06bead74 · b87b80c2
Commit b87b80c2 authored Jun 11, 2024 by 朱晨阳
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

JpStationMapper.xml ...f-api/src/main/resources/mapper/mysql/JpStationMapper.xml +1 -1

No files found.
--- a/amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
+++ b/amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
@@ -470,7 +470,7 @@
            <if test="dto.amosCompanyCode!=null">
                and hygf_jp_station.amos_company_code =#{dto.amosCompanyCode}
            </if>
-            and hygf_jp_station.`on_grid_type`=null and hygf_jp_station.type='家庭户用'
+            and hygf_jp_station.`on_grid_type` is null and hygf_jp_station.type='家庭户用'
        </where>
    </select>