Merge branch 'feature-canvas' into 'developer'

Feature canvas

See merge request !2368

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanLogMapper.xml

@@ -97,7 +97,7 @@
   	  </if>
   	  <if test="null !=sendStatus">
   	  	<if test="sendStatus==30">
-			and a.send_status = in (0,3)
+			and a.send_status in (0,3)
 		</if>
 		<if test="sendStatus != 30">
 		   and a.send_status = #{sendStatus}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/haoban/GroupChatPlanController.java

@@ -193,6 +193,7 @@ public class GroupChatPlanController {
                 return RestResponse.failure("1", "记录不存在");
             }
             Map<String, Object> ownerInfo = new HashMap<>();
+            ownerInfo.put("clerkId",owner.getClerkId());
             ownerInfo.put("clerkName", owner.getClerkName());
             ownerInfo.put("ownerLogId", owner.getOwnerLogId());
             ownerInfo.put("sendStatus", owner.getSendStatus());