Merge branch 'score_shop' into api_score_meger

wzy

2021-11-21 befa8124e15d7d7e2d2026c2596561b11a9ee573

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