Merge branch 'score_shop' into api_score_meger

jyy

2021-07-12 931aa435ba161f9f9fcbb8fa9d1e27add7638994

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