Merge branch 'developer'

Helius

2022-03-03 cf9bfc85093d4b7e5573422b8fd1a55c459b0d34

 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;