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

zhanghl

2025-05-07 a92b97225a0676c3645b72d8945542f7db2e05ae

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

@@ -29,6 +29,7 @@
            <if test="status != null  and status != ''"> and status = #{status}</if>
             and status='1'
        </where>
        order by id asc
    </select>
    
    <select id="selectApsShopById" parameterType="String" resultMap="ApsShopResult">