From b8d9a7cd20dfbaa3c0cc08f3c27e4addd8774e95 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Tue, 20 Jul 2021 15:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java
index b37bbfd..5cb357a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java
@@ -175,12 +175,12 @@
* @return
*/
@Override
- public List<Question> findByVipId(Long id) {
+ public List<Question> findByVipId(Long id,Long companyId) {
- List<Question> vipAnswerList=quesionDao.selectVipAnswerAllByModel(id,Question.TYPE_ZXDAGL);
+ List<Question> vipAnswerList=quesionDao.selectVipAnswerAllByModel(id,companyId,Question.TYPE_ZXDAGL);
return vipAnswerList;
--
Gitblit v1.9.1