1:完善查询聊天记录 sql

customer-service/src/main/resources/com/ym/im/mapper/ChatRecordMapper.xml

@@ -189,6 +189,9 @@
             <if test="pull.userId != null">
                 user_id = #{pull.userId} AND
             </if>
+            <if test="pull.merchantId != null">
+                merchant_id = #{pull.merchantId} AND
+            </if>
             <if test="pull.direction == 'forward' and pull.chatRecordId != null">
                 --id小于传入id
                 id &lt; #{pull.chatRecordId}

customer-service/src/main/resources/rebel.xml

@@ -7,7 +7,7 @@
 <application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
 
 	<classpath>
-		<dir name="/Users/JJww/Documents/Workspaces/pathfinder/pathfinder_im/target/classes">
+		<dir name="/Users/JJww/Documents/Workspaces/Jumeirah/customer-service/target/classes">
 		</dir>
 	</classpath>