Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-20 b8d9a7cd20dfbaa3c0cc08f3c27e4addd8774e95

 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;