Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-08 0b6d24919a6d85c5e0e8a374f23cffc900485fad

Merge branch 'local_20221104' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsAttrMapper.xml

@@ -25,6 +25,6 @@
    price, free_shipping_price, collate_price, create_at, update_at
  </sql>
  <select id="getGoodsAttr" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsAttrVO">
    select  <include refid="Base_Column_List"> from com_shop_flower_goods_attr where goods_id = #{goodsId}
    select  <include refid="Base_Column_List"/> from com_shop_flower_goods_attr where goods_id = #{goodsId}
  </select>
</mapper>