Merge branch 'score_shop' into api_score_meger

jyy

2022-01-23 c381ee31e4bc8c186878ac0178164f3604516783

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