Merge branch 'api' into order_reform

Helius

2021-01-11 854d9d55a86b7076abc4f526e90001bd806d324c

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductDao.xml

@@ -846,6 +846,16 @@
        </foreach>
    </select>

    <select id="selectProductNameByIds" resultType="java.lang.String">
        select
         title
        from shop_product
        where id in
        <foreach collection="ids" item="item" separator="," open="(" close=")">
            #{item}
        </foreach>
    </select>


    <!-- 根据id 锁表查询-->
    <select id="selectForUpdate" resultMap="ShopProductMap">