Merge branch 'developer'

姜友瑶

2022-08-09 41f67399e4e9e7f1df9ae910c1fb2ccb475435c7

 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);
   
}