From 698e358a3183e062943fa9dc1b144b6dffb4f66b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 14:26:36 +0800
Subject: [PATCH] 冲突

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java
index 469c1c8..77fa785 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java
@@ -82,4 +82,14 @@
 	 */
 	public void insertTimeInvite();
 
+	/**
+	 * 鏂扮増鍟嗗搧璇︽儏
+	 * @param start
+	 * @param count
+	 * @param cid
+	 * @param subId
+	 * @return
+	 */
+	public List<DynamicInfo> queryV2(int start, int count, Long cid, Long subId);
+
 }

--
Gitblit v1.8.0