Merge branch 'ty_fix' into alpha

Helius

2021-11-08 ad3f115b29e3c33b32bd38855bdc5b9f2de381b1

 zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardAssembleDao.java

@@ -3,7 +3,9 @@
import java.util.List;

import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.vo.ShoppingGoodsDetailVo;
import com.matrix.system.hive.bean.MoneyCardAssemble;
import com.matrix.system.hive.bean.ShoppingGoodsCategory;
import org.apache.ibatis.annotations.Param;


@@ -37,4 +39,8 @@
   public void batchInsert(@Param("list") List<MoneyCardAssemble> newAssemble);

    public    List<MoneyCardAssemble> selectByCardId(Long cardId);

    List<ShoppingGoodsDetailVo> selectCardRelationGoods(@Param("cardId") Long cardId);

    List<ShoppingGoodsCategory> selectCardRelationCategory(@Param("cardId") Long cardId);
}