From 14f20daccada2ebe169a45a326e13f4744683716 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 24 Apr 2022 23:56:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into developer
---
zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java
index 19a388a..b102348 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java
@@ -47,6 +47,6 @@
* @param type 问卷分类
* @return
*/
- public List<Question> selectVipAnswerAllByModel(@Param("id") Long id, @Param("type") String type);
+ public List<Question> selectVipAnswerAllByModel(@Param("id") Long id,@Param("companyId") Long companyId, @Param("type") String type);
}
\ No newline at end of file
--
Gitblit v1.9.1