Merge branch 'master' into xin

xin

2025-07-19 8841ef182bbe06a7ef1f102f51810502dde0a76f

 oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml

@@ -11,6 +11,7 @@
        <result column="category_id" property="categoryId"/>
        <result column="second_category_id" property="secondCategoryId"/>
        <result column="status" property="status"/>
        <result column="shelf_status" property="shelfStatus"/>
        <result column="main_image_id" property="mainImageId"/>
        <result column="main_image_Url" property="mainImageUrl"/>
        <result column="description" property="description"/>
@@ -33,7 +34,7 @@
    </resultMap>

    <sql id="Base_Column_List">
        product_id, store_id, code, barcode, name, title, category_id, second_category_id, status, main_image_id, main_image_url, description, price, stock_quantity, min_purchase_quantity, warn_stock, weight, width, length, height, returns, self_pickup, deleted_flag, create_by, create_time, update_by, update_time, version
        product_id, store_id, code, barcode, name, title, category_id, second_category_id, status, shelf_status, main_image_id, main_image_url, description, price, stock_quantity, min_purchase_quantity, warn_stock, weight, width, length, height, returns, self_pickup, deleted_flag, create_by, create_time, update_by, update_time, version
    </sql>

    <select id="findAll" resultMap="BaseResultMap">
@@ -56,14 +57,17 @@
            <if test="criteria.status != null">
                and status = #{criteria.status}
            </if>
            <if test="criteria.shelfStatus != null">
                and shelf_status = #{criteria.shelfStatus}
            </if>
            <if test="criteria.active != null">
                and active = #{criteria.active}
            </if>
        </where>
        order by product_id desc
        <if test="criteria.limit != null">
            limit #{criteria.limit}
        </if>
        order by product_id desc
    </select>

</mapper>