Merge branch 'ty_fix' into alpha

Helius

2021-11-08 853432d64a60950261f5cfb6b06328345b29467d

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

@@ -47,6 +47,6 @@
    * @param type 问卷分类
    * @return
    */
   public List<Question> selectVipAnswerAllByModel(@Param("id") Long id, @Param("type") String type);
   public List<Question> selectVipAnswerAllByModel(@Param("id") Long id,@Param("companyId") Long companyId, @Param("type") String type);
   
}