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

935090232@qq.com

2022-01-24 4915156f5e5b321a48eba19746bbcc740f34a881

 zq-erp/src/main/java/com/matrix/system/hive/service/QuestionSerivce.java

@@ -77,7 +77,7 @@
    * luokai
    * @return
    */
   public List<Question> findByVipId(Long id);
   public List<Question> findByVipId(Long id,Long companyId);