Merge branch 'score_shop' into api_score_meger

jyy

2021-09-11 e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9

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