Merge branch 'score_shop' into api_score_meger

wzy

2021-11-21 befa8124e15d7d7e2d2026c2596561b11a9ee573

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java

@@ -175,12 +175,12 @@
    * @return
    */
   @Override
   public List<Question> findByVipId(Long id) {
   public List<Question> findByVipId(Long id,Long companyId) {




      List<Question> vipAnswerList=quesionDao.selectVipAnswerAllByModel(id,Question.TYPE_ZXDAGL);
      List<Question> vipAnswerList=quesionDao.selectVipAnswerAllByModel(id,companyId,Question.TYPE_ZXDAGL);

      
      return vipAnswerList;