Merge branch 'master_xgh_pendingid' into 'developer'

unionid

See merge request !315

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MemberUnionRelatedServiceImpl.java

@@ -30,8 +30,11 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 		dto.setCreateTime(new Date());
 		dto.setUpdateTime(new Date());
 		dto.setMemberUnionidRelatedId(StringUtil.randomUUID());
+		String unionid = dto.getUnionid() ;
+		// unionid不保存,但需要传递
 		dto.setUnionid(null);
 		mapper.insert(EntityUtil.changeEntityByJSON(MemberUnionidRelated.class, dto));
+		dto.setUnionid(unionid);
 		return dto.getMemberUnionidRelatedId();
 	}