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

zhanghl

2025-05-16 fbb90c31d56348ec3fcc49af49c66b19992f58df

 aps-modules/aps-core/src/main/resources/mapper/core/ApsShopMapper.xml

@@ -27,7 +27,6 @@
            <if test="shopCode != null  and shopCode != ''"> and shop_code = #{shopCode}</if>
            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
            <if test="status != null  and status != ''"> and status = #{status}</if>
             and status='1'
        </where>
        order by id asc
    </select>