Merge branch 'pxb' into xin

xin

2025-09-05 6f3c170403f34d452b5dc733043145d8d760fe41

 oying-system/src/main/resources/mapper/pc/store/StoreCategoryMapper.xml

@@ -25,9 +25,15 @@
        <include refid="Base_Column_List"/>
        from pc_store_category
        <where>
            <if test="criteria.categoryId != null ">
                and category_id = #{criteria.categoryId}
            </if>
            <if test="criteria.storeId != null ">
                and store_id = #{criteria.storeId}
            </if>
            <if test="criteria.blurry != null and criteria.blurry != ''">
                and name like concat('%',#{criteria.blurry},'%')
            </if>
            <if test="criteria.level != null ">
                and level = #{criteria.level}
            </if>