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

935090232@qq.com

2021-10-30 cc59bd70ca7a57330801617b910c029a07fa2b4f

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