Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -61,7 +61,7 @@ public interface MemberUnionidRelatedApiService {
 	 * @param materialIdList : 素材id列表
 	 * @return : 返回群发执行结果
 	 */
-	String sendMessage(String wxEnterpriseId, String userId, List<String> extendUserList, List<String> materialIdList);
+	JSONResponse sendMessage(String wxEnterpriseId, String userId, List<String> extendUserList, List<String> materialIdList);
 
 	/**
 	 * 获取群发成员发送任务列表

haoban-manage3-service/src/main/resources/mapper/TabHaobanClerkMainStoreRelatedMapper.xml

@@ -33,7 +33,7 @@
       )
     values (#{clerkMainStoreRelatedId,jdbcType=VARCHAR}, #{staffId,jdbcType=VARCHAR},
     #{wxEnterpriseId,jdbcType=VARCHAR}, #{storeId,jdbcType=VARCHAR}, #{mainStoreFlag,jdbcType=INTEGER},
-    #{freshFriendFlag}
+    #{freshFriendFlag},
       #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>