Merge branch 'ty_fix' into alpha

Helius

2021-11-12 babccfd39f2bd712b957d6e46d32f32acd483d4c

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