Merge branch 'score_shop'

Helius

2022-10-19 39a5520c112081aff9f55ad13c1b4b53e4136a87

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