From b5f0c1c0ccc1def1b611abd2bc70403137c74722 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 25 Oct 2021 14:11:37 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp 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