Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-21 487e48afd7acf4a2ddddd02f2ec1db7fa1d91e99

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