Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsAssembleDao.xml

@@ -432,5 +432,18 @@
        WHERE shopping_goods_id = #{shoppingGoodsId}
    </update>

    <select id="selectGoodsRelationGoodsList" resultType="com.matrix.system.app.vo.ShoppingGoodsDetailVo">
        select
            b.name goodsName,
            b.measure measure,
            b.volume volume
        from shopping_goods_assemble a
        inner join shopping_goods b on a.assembleGoodId=b.id
        where a.shopping_goods_id=#{goodsId}
        <if test="goodsType!= null and goodsType != ''">
            and b.good_type=#{goodsType}
        </if>
    </select>


</mapper>