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

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

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

@@ -224,4 +224,24 @@
         card_id
      from money_card_assemble where card_id=#{cardId}
   </select>

   <select id="selectCardRelationGoods" resultType="com.matrix.system.app.vo.ShoppingGoodsDetailVo">
      select
          b.name goodsName,
            b.measure measure,
            b.volume volume
      from money_card_assemble a
      inner join shopping_goods b on a.goods_id=b.id
      where a.card_id=#{cardId}
   </select>

   <select id="selectCardRelationCategory" resultType="com.matrix.system.hive.bean.ShoppingGoodsCategory">
      select
         a.id id,
         a.name name,
         a.parent_id parentId
      from shopping_goods_category a
      inner join money_card_assemble b on a.id=b.cate_id
      where b.card_id=#{cardId};
   </select>
</mapper>