Merge branch 'developer' into alpha

Helius

2022-03-09 2c481ac06298b5c464fd927893ce4c62b03c39c0

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