Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-10-25 b5f0c1c0ccc1def1b611abd2bc70403137c74722

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