Merge remote-tracking branch 'origin/main-zhb'

This commit is contained in:
2025-02-18 14:02:32 +08:00
3 changed files with 3 additions and 3 deletions

View File

@@ -33,4 +33,4 @@ public interface OmsOrderMapper {
int updateByPrimaryKey(OmsOrder record);
PmsProduct selectPointsAreaStatus(@Param("orderSn") String orderSn);}
PmsProduct selectAll(@Param("orderSn") String orderSn);}

View File

@@ -874,7 +874,7 @@
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectPointsAreaStatus" resultType="com.buy507.mall.model.PmsProduct">
<select id="selectAll" resultType="com.buy507.mall.model.PmsProduct">
SELECT p.id,
p.brand_id,
p.product_category_id,