Merge branch 'ty_fix' into score_shop

Helius

2021-11-12 1e73259f37922b2556659b60dac0140ed9eb7832

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