From 3c41b7dab89b1db8d206e0cabd783bd0d086c5ee Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 4 Jul 2023 21:05:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feature=EF=BC=9A=E6=98=8E=E7=BB=86=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderMergeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java index ee1025f0..c228660e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java @@ -1001,10 +1001,10 @@ public class OrderMergeServiceImpl implements OrderMergeService { return R.error("当前勾选明细行未发现满足合并条件的数据"); } mergeOutItem.addAll(orderItemInfoList); - log.debug("明细合并合并后{}", JSONObject.toJSONString(mergeOutItem)); //对比合计税额的误差,此处将不参与和与参与合并合并对比 BigDecimal hjse = mergeOutItem.stream().map(t -> new BigDecimal(t.getSe())).reduce(BigDecimal::add).get(); + log.debug("明细合并合并后{},合并前税额{},合并后税额{}", JSONObject.toJSONString(mergeOutItem),oldhjse,hjse); if((termType && hjse.subtract(oldhjse).abs().doubleValue() > 0.06) || (!termType && hjse.subtract(oldhjse).abs().doubleValue() > 1.27)){ return R.error("合并失败,合并明细后价税合计超过总的误差范围"); } From 93c6384eb279815c2594f78294a9c18b50708725 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 4 Jul 2023 22:27:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feature=EF=BC=9A=E7=BB=93=E7=AE=97=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E4=B8=AD=E6=A0=B7=E4=BE=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/download/OrderExcel.xlsx | Bin 13230 -> 13234 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx index c4d8a393ee0c554d97c9de77b45323c5593e2ccd..2725823670f105a16ec35659d82da3ad2c2797fb 100644 GIT binary patch delta 4934 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 E0CYrOod5s; delta 4916 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 From f63ba685d2eedae9e77db1f9cca4fb2f383486cb Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 6 Jul 2023 11:24:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feature=EF=BC=9Amdm=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=AE=A2=E5=95=86=E5=8F=AA=E5=90=8C=E6=AD=A5=E9=9B=86=E5=9B=A2?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/openapi/service/impl/SDEnregyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index 6d7ca9e8..08818ea3 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -139,7 +139,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { tempMdmGmfxxtbReqBO.setCODE(code); BuyerEntity queryBuyerEntity = new BuyerEntity(); queryBuyerEntity.setBuyerCode(tempMdmGmfxxtbReqBO.getCODE()); - List buyerEntityList = buyerMapper.selectBuyerByBuyerEntity(queryBuyerEntity, null); + List buyerEntityList = buyerMapper.selectBuyerByBuyerEntity(queryBuyerEntity, Arrays.asList("-1")); //批量新增或者修改 if(buyerEntityList != null && buyerEntityList.size() > 0){ List buyerEntityDetail = new ArrayList<>(); From 006d3246750153201311b4e72b6edddc11e183e1 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 10 Jul 2023 10:55:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD=E6=98=93?= =?UTF-8?q?=E8=A1=8C=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/constant/OrderInfoEnum.java | 1 + .../service/impl/PushInvoiceServiceImpl.java | 3 ++ .../po/generateinvoice/sap/FpkjReqSap.java | 8 ++++++ .../consumer/utils/BeanTransitionUtils.java | 27 ++++++++++++++++-- .../resources/download/NcpImportExcel.xlsx | Bin 11933 -> 11528 bytes .../main/resources/download/OrderExcel.xlsx | Bin 13234 -> 13224 bytes .../resources/download/QdfpImportExcel.xlsx | Bin 13403 -> 13111 bytes 7 files changed, 36 insertions(+), 3 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index 3d6652e2..3815803d 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -407,6 +407,7 @@ public enum OrderInfoEnum { SYS_SOURCE_DSXT("DSXT","DSXT"), SYS_SOURCE_DSXT01("DSXT01","DSXT01"), SYS_SOURCE_DSXT02("DSXT02","DSXT02"), + SYS_SOURCE_SNYXX("SNYXX","SNYXX"), /** * 订单类型(0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单;6:历史数据订单;7:发票修复数据) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index ee3836b3..3a9e717d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -444,6 +444,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { Map map = Maps.newHashMap(); map.put("ec-key",baseServiceConfig.getEcKey()); result = HttpUtils.sendPoWithHead(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword(),map); + } else if (OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly()) && StringUtils.isNotBlank(pushInfo.getByzd1()) + && pushInfo.getByzd1().equals(orderProcessInfo.getXtly())) { + result = HttpUtils.sendPo(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword()); } } else { result = HttpUtils.doPost(pushInfo.getPushUrl(), requestMap); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java index dd925359..2c85dc92 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java @@ -23,6 +23,10 @@ public class FpkjReqSap { * 数据来源 */ private String ZSJLY; + /** + * 山能易行系统来源 + */ + private String ZSNYX; /** * 操作状态 */ @@ -39,6 +43,10 @@ public class FpkjReqSap { * 购方编码 */ private String ZGFBH; + /** + * 开票类型 + */ + private String ZKPLX; /** * 不含税金额(SAP) */ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 29932e95..5ea71ffa 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -64,6 +64,7 @@ import org.springframework.beans.BeanUtils; import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; +import java.util.stream.Collectors; /** * @author :杨士勇 @@ -3537,6 +3538,9 @@ public class BeanTransitionUtils { if(StringUtils.isNotBlank(req.getZDSXT()) && StringUtils.isNotBlank(req.getZDSYWFL())){ ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_DSXT.getKey()+req.getZDSYWFL()); } + if(StringUtils.isNotBlank(req.getZSNYX())){ + ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey()); + } ddtxxBO.setGSDM(req.getBUKRS()); ddtxxBO.setENTID(deptEntity.getDeptId()); ddtxxBO.setBHZT(ConfigureConstant.STRING_0); @@ -3630,9 +3634,26 @@ public class BeanTransitionUtils { ddtxxBO.setHJSE("0"); } } - ddzxxBO.setDDTXX(ddtxxBO); - ddzxxBO.setDDMXXX(ddmxList); - ddzxxList.add(ddzxxBO); + + //如果是山能易行按照物料编码分组拆分订单 + if(StringUtils.isNotBlank(ddtxxBO.getXTLY())){ + Map> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM())); + for (int i = 0; i < collect.size(); i++) { + DdzxxBO ddzxxBONew = new DdzxxBO(); + DdtxxBO ddtxxBONew = new DdtxxBO(); + List ddmxLists = new ArrayList<>(); + BeanUtils.copyProperties(ddtxxBO,ddtxxBONew); + ddmxLists.addAll(collect.get(i)); + + ddzxxBONew.setDDTXX(ddtxxBO); + ddzxxBONew.setDDMXXX(ddmxList); + ddzxxList.add(ddzxxBONew); + } + }else{ + ddzxxBO.setDDTXX(ddtxxBO); + ddzxxBO.setDDMXXX(ddmxList); + ddzxxList.add(ddzxxBO); + } ddpcxxReqBO.setDDPCXX(ddpcxxBO); ddpcxxReqBO.setDDZXX(ddzxxList); log.info("转换后的DdpcxxReqBO:{}", JSONObject.toJSONString(ddpcxxReqBO)); diff --git a/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx b/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx index 32707f0358083f6f4a2c7e48f90da0cadda9707a..bd5f508a0acbb1ed072e3573f5e4271b88194b7d 100644 GIT binary patch delta 4890 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 delta 5250 zcmZ8lWmMGN*ByqE9%1NKV(60YW?<+B=@RLX#vh0vB_cyJ(j}6DbfPZr zJ`K(klY{9h8sbkU*5g%}|0aDen80jFFIoEzTz1`YggP!rPOE&~IreMh`_YefAS@i_t*#=#esJ;pV~6lOVGu40 z*0)ZzCkoq+Dz3n{S+l|?D0>8d4!+^{jKK{1pr*mpWqiS^y6c|OQ9{1gRlZ|&9cz=B ztZ(fH9~Xpm7lo%zW=uZvu}JIcDw|8r;5O#sfDYDD#ReK0gbAeWsP}evlK7p)E%`L7%jm|f=IX9YY-v8rjplAAwlat#xSX+PgU`J1YhGMbtx(G zoaw5d^e5CZ4I%BF8!g|WwU1xu_#A?3953vrIYobP_Iq};G{FVxRMy8Prs+gkmv7@q z<((FN^lQDsdY()iEZmY1qA`&Cc+iiyN??5aEm*h|4hWP5MSh@W08q&m9$Ea*s3Z16 zS*A5yevHiA#HUZmE2emh{Z=aJ?Ou@63N8JbszbNiVZw_LhBMI%{oA3dJ_nd_zYCyU z+0H$N<`3xlVb(l`(lbX zSeRg)O;Wnfv+~Fkz|0xWy}YMsFEOgNrL3m}r~CevrBzuvZ=!+Uz`|#UfqVr%x5)5M zMX!qz9gV0V&nZwWK`r}i27|;97v4tcKo~v?Pqs+KlsymA(L*gfq6C^stUuF}{o_{R zaIH^*W%bO71v1sVm4`pxuzERe2oF4I(3h)u73@F>1w6MO)a-dx1JF^ z?u1pB{qBGIyYnS%5})mHTV=|k#1@$pSw!RszLR|ER`8tcZ9KF8*-}fhK!A$Vbi;-~ zSW4B&kwhtAqUqNy13QT`uIHGfd+js6cbsyfX~*2`eDAE?Gj{L%Ghw89R9N?nsV-|6 zfg6)}>)UFdB)U*wCnJD@Eijdx8h>ZZgcX-hsx;U_VkejJSz!A1F890DwyKwgNB3?^ zTU+|>_oQ_btXS)?nWm2(MLl^f-6V=Pw*Ib>%;W+Jh*H7MJX5ui)PI1Xw`(;32n0f- z|2>jZm%JDGp~^tyiJfFb6&6Y$n?t~w*45`0)c-6~=Fx8NBR6#Wz-Q6Jf&dx@Cf5od z77w?WfGvI9#}UIn*MqD0I#jECMrTyE#)p02z>4|#)~>{SajM7=kTRdfXmfIFUNix8 zGEO&bURt4Xlrt#D3#si?&)Qm_o)+yX%qY=L%E3>wJOZw>j&=iIbDJqurQjB0Axs4w z`jUn96^fM*F&Q6ihEh53^!4&a>b7eHp?=cx?DOXPgAR^u!qmu^2uov!%}>*3i<#kH zIQvsFaJwdgTO5iJSg2}y+d({YHX{J#X>U6k6N7k(YDC6Flj&zfi(_QFiD4wTktfIx zkzs=?i}A5sN1^wwn)R8i4=kD7frzdz5poFiCzRmhi_&zw5or#H=ViH^L~xOvO-~J# z6d}3P{K3*|JDPKF10~VKs)RzK7Ky8Eu3YY+9ut|s(ZVByonv!lu=$I9UO+a>dJ=!W zhN9ad*yANk3Dyg9g%U)<+-lh5ncXrC(nO>j+4>P17bxOFr+M1YbN%1?D$Jqfi%d-e zaFS;np>q4>3F{w4r@xghmNd<`+Ch)&VUsw%$5`aX3!j^gq^T{G4`r_5#( z)SM~CIhcdFUeP_cZ+I9A7da`*q8DmmyD8Pn0mb%Wh@I=aH{|V%p{?3bX~o`P86&x0 zYItHZFVwQ}t3BfvT>@)@{ew^Sa`(^7=;r3;H~2NW)Jm>_ z@kFAo#xbUK&9UWugvzoUc)LjHLuYb0=C|IOiCDkWa&KXd`HM+GORjw}GP9n|_Y~WO zFZ*2akqLv|^C@$&_lry=mZHPV$0&W4W5$zI60a=JazCM?YmKQkW3AhNrjBDS?r*JE zr0pFfR}*0jG*LVsi5revKltu??S63rsGj`1**h1RQW!w7AwN~F_ z#8-4iZh?xY@4$)kP2@m__>BN_>ZUT;D!G^*3nkC1Ld4NG8K+Ve=bt~AvVzS~3evc$ zL?6lxV#9lZ*1v=9~KBC3j{^X=~d;z-C>D@3n{6vESPc-^xY7>-;zUzeaT9k#f3}M52piG zR#R`g`PgX*b7BGbTauhhB%k>Y)CyS9gtmCZp(AtB(1^H z9Xsw_USAFoxV^~o;%$JgRr06e$W@2fRu(>f!_D=^SWNL3xs@G`l^(AkOCDFMQ9A_{ zYm-^B?(nC>&LN16V+{Y$IxiD7sfXyk zD7i)z<~_~xorq9DQh*@)%)k<(vTr)M_lkLC0-pyesumW)khEc5-@+cuJf?KY9exxe zm?KVKt4ZM?C~DhoLpst#D>%egMM_17Rjg~amC2sVZjR2F^K~`cFWE@0#lhKjsd&9A z_$NVmPd}!@QFGu|@CJh}l^0ZHgo82)ixKohx?3k|n3@rN1srbV0K2AKEZ&~)ylvL> z?H0YtGN>_xo~my#Zq?JGzA~bbXcIqE# zqBW@ZA!v3FduLH>57y)#sCE*qDx6}w&m^P-6!HV5i~dW(jjRy{MiOb+{G@Xfv=Y;D(2`hl09ryyr<%B>eyiRdg(l!-Wog_MV}3G7ozJN?J%2MLwGdeE7H~2>bbxg9}^eOYA6vpYcUh~3= zLV|&^Q^OR%kZif~X{rRD@ZP*y&8yD!Vdqmr;Bu{np zd5xv%Efs6See%rLr4#QtQquPjx+aDsGt=jei+x#tG}KeMdw%|k+N-Qtf62Q{TCeG=AgAMeMWZ<_YL3>}Gzna}Vot;Gw5_tV)L!&q;RR#r3!mH!74=(NEH3 zNcwZo@1LV&TCs|z%JcC$to7=XZ3@1|dNg~aA_C|?$KP_+05{g{z9^l>AO@HMh7d>Q zM?3!|&wuc=CZmR0Rt93e)OGaWeX&pEDl_%?ES*MUYb$a%zgN7DwU><@ z2%w)4Z^_=!(8{xIkBipIi*>{-uTEqW1zR%yZkxy%4Q}_B&KfV6@H^bMGV_qq4)`{y zt*7%)Vii_$Ow7V*!*$v)y3p(TO#S*g^flUA_vJNXvtn+?fx=bSzFDW^Uw93PD(I3u*e|H-{ zL@)Vl$A@kp$A=F;V{Gc?0+$5UZR z%Cqwen!-uPvaNhEvX46%RzfZ|1yU&A^u7}01VBHMD&$?^#oZS@v4F7@wlLXfW~(%K zoSv-6a$hu7c6(>ak>(36-J7W|=6UgprX!7I<7PkIF^-JO34k7*?^$A@;RVWVRs}28 ziJm{9ErdPLZmlNb z;i$bmJjHq&?5OyeNs)$qF4HvhxMlY&HwbkEUQPwiHt^z_V56G%OI!$2G_hq`1;Wry zPVu*AgVLxU`}hW%9s9@U%%lM3zix?3492J(VHv_59=TabAmXeh*b*9C>;B=4L?+7T2jBN>^D+Ns zO_|QX*$n*2_*|^`okBs)$ZX>{-zZYX#<#79ga%JY7)JN^Kj@jTN#MSzto`}|oTHR< zf>^+JQ>Z4i;}gkk8qe=h@>&reRSW@|am;yF12M(e?PGiO@ zoPU^({bBNl-s{?QHZ}}EtA`&Fd8xL{e3~tR{ZeO(iurjjSgDBOqCeviMJ4?g#Tjo3 z5$?oB3@&#}(gEwF=p-+IZB<+3+J@E$?1-tE zu%l?|AbfE(_*b~c)g;S;zK!%_g;Wn8Van|GY2+1Z)j&hG8@ow-`m6IWEz(u{h)ASTm7LampKvQ}T|7v^S1KJO6{maWvw ze~NC@)qY`3wS+T;Pe18fHO$LaRaNZ-Sg2e5Le;h#`Bcg(Rn?keC5?t!hn9+A))X6F z&6SkZFjb}OD%JFqluqYTHASln)I#1oi4CJt(Msx&QEJxIx=oFks;=1Jzg5*57PD3> zoy1&CF)ue8pO=hU157Myx@NDrMukMJf0Q3vsT-!Uti!mkiW#NEY`ZTp^EItx8kSM9 zlVC1I9gUBqa6?#tC%JPh=t0h}4 zL!N|$Z8XlS6?;(Cbxn z|B0GLC@^bPjEAR4u<0V<*F%cAq?pU3b5fR&(p7<{Qq!`Hn&+N7 zHovosXCfDvNGE$_DJ_d9w$bg`e}G@l4M~i-0UaIV2FxLMB=E~jNT)ObVRucyFAIj4 z42|J<2Sk|Gt~z;OVNYgzP$1r7gr!a-Wb<;D><)7A7Inxt^&v>Tm_B6~2+^pKfEAFA zlLvw^LWBnvNa+;%Fk0GwKnF+(m%k!QJ9&t4Js07+$nq;i5)`t09KR%ge^P}qKUO5laQE5yTK#$-oMsG^`;O ztYKFQ*`B`C6$3mq8GmiMno7d zHlzmnb}~61lmhnzJVPj9#Q_Q;o1|b8qmdQ4 zGZeX9-B1PU@l@LdYf4tc$Ap#V6^HmDs6e+r} z(ZEF)qD*V+I~QGI9EvVf@nA7Wu^I3&{$frg;DxUwBWezDAc#@J90+2;Sq=noV3Y$v z44Ci+Ao&aMBu5F2dWu2F{swtI9d64Y#hIY7QkarIn+As~#0Un?a-2YnoAW%+xx1`% zGL707I3^Gue-|kP{s*}Vh7%zglq^g%P>t|?4 zEhH3OH&zF9rGA-y%~y@pv3jFvPpFoqtUx#96A^^NrfHZFp?9)8F2f17n9lTMyGhi^ z$$wK<#DXCHyT0Lk^P^y(vw6;1sw>r13e|H{yeQ@U|=jlD?_V=A9J6#e%J$rO` z|61qu?SsuHhY!~ewm1IU`)+^hjkEVvyY;(s`<`>{CTQ<({nL4Rw@W4(d+VUw-rH#J zK4|Z@+PmuqH~#3f{sdIJ)e>NBWN!4OqJ#gS!B~>>OT17}|GV0|H=Q>d;A59_z2)5g zf93GUm+bi(rNo?^pL4I9K43{0 zl=Fk!a6EqGtnZOBu=SVobaVgyv%~cVe_mJ|*2b5%ckgtzb}*LO3AcST3KU16436+d z-P!uN-TKwzE7Z8dt#$fxysxNi!ChJd%JGC^u4qu(b+`j0S8ci8UOAoh|9atg%%pd7 z+%~v9BwFP1X4$ae`i#9*;f7X)ttGjIq~96UZZ;APrJOL8xrHek>=K0XRX!9=d%TIU65n}G2g zNf{=J2(7Fw7{*3_tRUkia1Q0fMXob$-BT}d!NntA0`3tq#2HvFx#hS5`bA4bJERmX zvUt*I4Uhsu3K=MCFbydF@mkQC`Lm%`I?gPyo5Jn1i`!*O(TJ^kZIaelmSs@(>liLS z#q+Dnn|f70QPr&kpg5F*2@TxlI^KT1Z{J?OK3+oHsa6+ROu4aF?%0b2k%rEXk z{JZX8b@qk`(sOB8lYOt;_0K1>DT;f94tz57$zVoDjGi(=9;&ei{Z+cAknM*5OYHT1 za^h1mBa{sYqoWRS4~XmBhd(0z2D1t+UFo&mRd~^aSA@2mkva)!^lY4Y$4N7^rk>96s@D!Fl#kk)rL)VrJ*$)YQ)kE#R32Ay56#xwT5~W za}CA1xYGJuH5)B3v7{Tiv*sBUQVq2@f41_L z(QD?wsF%dER;sGiloi7nGL3V3)v1?+eu2qm%+)bXU#>ggoeY5@@hVo=hBaG-M1ebL znGB?w23UpvsfJDn2XR&|mjns?4=mcw8VPyM$5SNO^pNoDBgH~mEab8UDNiWsslb)G zVmoHTch8$!Fj&qvQ3y?B(|xj(f0e}}+vxRez_0IyBqrQ|fevv4R+Kjr_+=)fW14`l zdnVwQ1w%|n=5V+JA}n%Gom{Z6r}KR%5N|QUQb))X80igj@fLN+IQ1b+y_h{_7zoj* zk&qRTj-v;HF+zk37D(wB`Y>BMen-Yy2$b?#S#>;e|#9fq+n4+ zG85?b#zvA@8l*6S2hBiY(IOX&x%u=_GfuKX*E(E;Yv-7>lVI^uE0I;)n?5q{B({L1 zFb$%V&WZ6tayWS#R07XdIT|4A(o&$ zkcL+hY-nkh%K5&5%q3`3s*f2AFr>c_t)YZuI3XEHNJbNqlL^UKLNcC^kY-GMX8xQ? zNKPjtlL^UGLUJY{Ih&A7Q%Rq<%tNj*SYxF-5>Mc93phqQ?ooL~jDtE5I`pF#@rs8* z+#B*SP^SYsQryfi2O`HIBOFLB4jJV@@^Q#X4kQe%w=l*y5H#y?4g^hlf&=M~`*Ml{ z5fNcd^Du}olN1w8f0KyfJH?9(8tM#hD3pY=JPgXhG!KK)FvG*3Jk0ViC=qkKd7<#k z`xvOu0sTajtpy(gr8mT&be-d1BoxE*JbzFw7CCnED25k!W8pec;Tb{+s|->Q*(8OF z7|pE0U7^VB3U7@{csSlFmC)oWymcxehE&)}jiy9G6shpmf2xEyQsJ#u2@#;eTdz_W zr&!U2jRr2d5M^3h-?``#<4|;=iigb{#bz+T1kIdEz>7dhM${bUKoFxwI1t2wlN<=* zz!(RD7%=HiKnfc06h{fodYVDV{swtI6MdFLinHOvT6tRjYz7>z5hEBl$8iENZr=C2 z;O(-q=`4DFf1YCk@o|wt;D4B_a5^!fLCL~I1GV==G-4bR4b5gSzyw62l0%8cfuPkk z!hs;7jWP%u`6NdN)v+_RMG!1FuLnGMoeq>uyH=52T`M9jwMN8Vbae{U#2m-k0MVjR;CZ!QB&KtC#p z(l3X%k{k%$N+uyPrXPa@^y8RCRc(v|L8WMlGcqo73_|FKyqbwVOO(0j!+u1~InKbC ze15bKDs2lmB6InZ@nk(dtRD{YKNP}Zxc*i3r zv?07af6%JKVZ5WOa3otZn+`edC0pdR795*4%^|btpXd|CD!iC4D25Kd1&L$@6vr5J{}I%p`(i}Y>2Zmy0uTPx0_X4}d#3`1TKK{#SrrWF&?bLGl}4CmQm zHrJQ$B~d5e0agq}EDPel>l^MjFS_lA?( zNsmNO&mQdGz0!Ssb8qv}{{8j6#~c6ce7C#x#@+d<)BfGPdB?qS9kh41{^>rw-6Io? zopn&|>}+(l?{&7@o$d9#Ykzdxe*&u0ZVS*GnHvL{_~bumFfPc&3%pQJ|9d*y*WEW8 zf8b+}d$sM}{AK^gmvHmZyq%MabH2B!MY*`h^L+P*=RNM`{jGI+bGWalY{9p*7L?;j#ah;(wj1z8kbG(@^!Llz zeDK!~$72@#HphJi-x7%yIYeJF9r%34?&|QpR)ei2`FIDN#&p;X^c6Dhtmdq=BT_A; zrCGE3m(UfU3z?Po*SaV{+Z2rFNXjr#4$;Eel3{Fr!~$||0_RXpoE19f);;wcms~vZIp7WD6)c`3lWRQch2GfAzAFl9ep++ymk|_u-F-zX7r>U%$4UE^bQ>s<`i^d0p0b#k-;LD)}o8isoBZ zuXGWVI$mpx7DDICv+;_q)W^=$f!%ehJFICION=aKjmd5WZI%_n=j&om7{;U@ZX*%! z1IqXSC)5T0*r{_u;jlDmPYS2=@q#y$O%1*pGhNP7AXtZ`vey{2 zJ3j2UtP^2US$gWvD@r?ei}-^vYO)PbPQlmYBJ!SfOnL+5ZPaJuRp^_L6C^OW7f(r% zb}b6SakPDv!}jnl)dA%THZ%OMGv#j(>AJc)=qT(;{L`xhardr8xam(I?MdXkL%yCD z#gRb&1p)j(|Ilw864YyS+`GY@5_=}6+O+i*vIZB&?MKu8aHM{_w$*_XxmTmWLsTD` z)72)qGF^ogb(w;Tj_Q-iuKEXODdy3iK3_M>f1Fl$uZVJN_snV;poTJkX1j_s_rAJPeRtKtSsz4)^y>MjSI z?Z-a;jf$5S1dy5{0wN&@8HD<`PXk)Bzk@$R27&4*K_J3^#f__#v5UExhMSAEgQe>~ z!E*w&S0#fI{&Cm_Qj|>6AZze>cMJ-m5bIhhk2#z+(Lm-(fF7M~+M+ExTo+N3LZ7KK z5d8yTLwmjMYeVo$;be#B9t<#^%8cefI`!amx2x?Z*;^Of&+?rVo_e=$e9@D=W4ekF zF?8(K7Vb4>&pq`{zwZpM_;?xj<(K1^fYvcr!|XL46Drp>3dv{1h-AR%_>Anv$DgA8 z_zL?nUu2^n@P~~E3LTL&`8u|}rC>|(KDvup@xM6mwzyL9qPW95FX`JNr{ca%n?NXX zZkro$?K|6N+rSky+HKiq+ozg(jk7G)mD+^mli4Va^DG<=s487N6W{lWAnT@idtC{+ zwE5Wu{_HK#&ks>O-I=UOwwqT#370*k{FdK2X>ytmn5N}nH(IS8y7(UC$gd1q9`oGm zq9}_97-h|k+FJ+@I2s}agFe19eAgby7BwpNj)VrdaI#l@m{VIur)!b8$?N$ZQmmK5)B)M4QO|7(9~eiu|4sX$0;gQQ%X zI@2x4e}|^^cK3=BpIBY3zs^`ubuJ=}J3W%PJYN4<%FDdKy;26cH0VM{)R-6o-b?@k zXbK0fna&ZMMs}~Pc|u`rm>+AxUu=*Zp7yMHRwJPVmCUz^yNQ~KV2|Nn=(_2T#1G9s z`~v2T`r@3>_KV@S>Y?%4Ra*sn`5A{1H;UwF)G)pw1KGk(u&dnW)J zjRf;QOPNDY-#O+ClRq{G*r)q$@=5bBHd-Uuve;YBYgYssVx=S(BH@o^nXd}?@HC0d zRDO8GBwg`XTOBO*t`+`Lj3l>k4?v+DgY_U)q5U3V=8C`%Pm zk)gJ4um_(uVs8~n9LFvA4Xs)>PM`fenQJW=AbR@I3Ad?CFg(jf-HB%HZo5(wP3zsY zQFK@ndDU>O+H-?ov2F4@M@J&cwAMg;4tgN)Q}@Z1sB-1{Ot|h2t3RL=yBb4;yc8Vw zOsk(ixH}t<{qfD4{Mp`q#tRVPf(=wPWSwtR2 z@FC{s+Px8huab+ljP=E-Rg!226NI`K$D73(?`DL5I2Q$%G|aeusIoKmARORAJ2^uKfbatFu7gBKxDA}u&^!bqGJ5USfB5JQizrvWK!dCU%}1k1<;PKcVG39}5KRLcL4g(Zm6EC_aUt;yf0e9L2EIHkPJ&7( zW5qkXJ@s6~3e2oA>PyyG6z3;aC205Dl`~eEkWSABNnNXo@K+YCfW#*VQIMh*O^l_7 z2!=fFGgQZ1m`y0)b&L^%c^Kq}I+K~s?92`ZHinXH^T(%rD+q%99lHR_a66nU-=^?1 z653c3e>E{T&G!YrXvti29_L{hYER}cCi*jG*bu)~Z@dtlG~*WJHa_#SY!6pTR0qO> z0iq#~I*Q-boTJbxz*1H~FV-c;7adqpqy-UZuA$1%o7>mJq)%QQR> z#z9Y+0bdX-^(CVZ+Lp_kP&;noh^T*(@Trm-60NoJW&|NH>uai0_u-?)#QjDutr%N) zMFjZVGxr!+*?o0GMyh?P$P4NQtty$n>GLoK^`c|6x}(y*nT;!DuU0D=eo}_$y+^=1 zh@m+kKYN~H2t*5TYyAE9ANB9o5*E)zR@X}O6A7&Wgpz%S2m&F(iYfR21qi)BgW$;` z){1%ZX)O-N3FL&AP|z*ANco=iPEMW|_Pu6@KZ*|=p;PdX6>$DSx9rcQoa(G{6?_F2 zy9)}#Opq2TTILY@m=X4wmkT|pj)Xfa9yB2rlyxKWyFf3Jl&+XgA`}i>ODjf4Gx&NA zoQEgx?A$#>AHs(=r2z(vQg9|rG6*P$6Bx~lOrfmY0}x4u2o*B>UiyK@v5{uHOSc%L z*J?5YN|zEcWbRp5+*vzt2qhXT1L_lcSXDKu)?crK-)@7xrwYkiNmb?FC~qLDbU5^K ztCQemo58!8BRD=rO^(HMjY>RXTa=r3I9&eVA5yC1_FaqQ&LRikH4%pG5V=WJ7kFo_z{o&-s<_D9iKfDoo@kfe_B8z}9#gzf zw*q15{&%DAfo??Aetm}TAS9l-Res@1s4e;R`LI&CW&#ch9J(aNpWchC39jjhE0O>x zn%<{ho4rXjmvJP34RB2bK>;h8c;1;LuA&b+e68_rwIA(AC+J`+@E5-VhX$z&XHN{q zec&!pGk4KEUaX+p^Rf_J-$O*Qgd{PB%ldG6&It8UNNl_MjXCnHC2hDFBzB=JxTFo3 zDQtrp=IcwNXs%m=D+0u>;HFGVM%+uCH_LZ5zm3V!Qa1uF0u&=3dxkE6?yx}k#p6Lj z9PjW{Fdk2s3R(ljs7GKw>ZpT3;)T>j8DnaK|A7CgZkV{ZP8*@oBI8mOYZ#PGk%6#; zkv1k%!MIb2?Qs~wSu0Ogv`tz<)=COxJeHkyzSTJ@pa`t`fafjNl`-7C!tC+`*7G_nd-zd_?TM#q8!yq#Dt|D>-P0lSXZ>K_D{<$NG<7ty>L|WSEA!PBVwt|? zQssMlsOb4uFVF3HUz(AwrcgV_5UpLu7koumgWRf)2bbbz6xP8V>Mjj&eabIQ@@s;_ z;1ysnKk56upyWE+<+oGK^AVvXK9#ofUaBIZj~G#U9}HWDD(^~OGG{R)4)tyf?tYTr zz!X_??rN%C7h);dUJH#kwS)^1VoVQAov#D;rx6=KnJ3|_0Kw>HioS!vLeHF5+P&jO z!1L|rMx+_kd72}w;4gsR_5GJ~k>?9VWduN^e5PJ&pZ6{N$)%gKejY!%H#86X{oZWg zm1)8z8iD0?GMuguAY&pRFP>qufZ;P4W`dV9aP8_XVctX!e?Xf}>{Nl+HAr6!_jFVM z98hJ4s^r_>u3$CEw}+qKej(5Dofj3s_8+T>?OZ%_ICFB%cSzZc>G2Rm3i*}Ujt?}# z1Fb0-alDLMEWhFGUbmgsR}^R2^Yj*(^Q{s&@cpPPT0#|GdFRmbn}GcWa1dADz zM~Bozqss3zddtOkTOA`>&2(#p-VA9%PK%$zvbcRS>mqL0OvHR}lP$X*_r~Atr$Z+v zSJUr(JPxZ4eUj#~*;x{GTg>hRCp#BJQ`j9H0oE=~JvQ&onGHU>V#mp3Ri$sw7RSk5 zDS{rWg6p}~PYgx}zSp~w8&r^Tt#7VYcbMO{F~>z#4+R{iF1E^j)oziitWTn4gxks% zZEkI*s-JcPa}W2noLUXaP1yu8^Rt%k5%8Dlv8bN!u`7d!YiTFDLxvG+RQ^zPn}!qUs}Q zVDSsXiK(0~;T^XIXDp;Z{9n6QgKO*0fTX*LDrd7_7_q;z8qTRElgW378@DLFr7ZU3 z;&j;JqG8IpzL?G22*jZsbmbY#z8*sU@bK{ns-uo8x3lgCMT#($nG)?uIie8}gD)2A zwT#p(X2FvFwyqG%Dqz&E5c43`~G4k$>M zjyZ_Q60CwoBICO)rE-Z10;@65A268+3lqrt%uoo`YOG?3)xWdM)zRaAqmFuCY*Z80 zQa(=K;w9}m?6oPG;4>^!BWIF}L|zQ7QJj!%!GqtT{B6=VjBb84v`y&k8i74W*E;=b=I z_#$LaAN)v(PELe`LsZzt+QF&afpM(zwqHM*v)Ra~JS@hX(-bCIQaCJC;^w??HyhpEr2 z3StsZsyf@)I9rsdp*r)30dR5)f#!IxBrd9{G4tfaOb3_|M{?h3emDs)NbV27;yI-{*$AN$>dbS=0XMM+EhW=2DJEyI7DN3oFP7$5aDJ${ zFf!qATy$5CRdQ72bwl0FI*67Rc`2U zig<-Ak)2nI3nZ#!!kL*2$bfZf=q>(QOfBX1uM=P0F!9U3C3|DG>eeEe?-9LKaBb<) zo*G!tm_oBY99a)W{zjoqI>$gvCW-~vNO7w0fg>D<7PksL7WX$I3gaMf;G=n`4`X9ir z#;_p)lJnW)nFm~7He%SE`+Sv@@D291EZm~Vf0{NE{0sit`!{4-r@p*YaZ8OzpJ8xl z{c_nB$EGEdoS<9^ zt(v+=IdWW0y@gi>Ou0TJ>(UsYLv|_46)WS|kkVYf7_c`;v=Um43jb&77h?IV*+Mam zvzp_=4|2)y$}K}x$v*!q+e)%a@VNPJdgfx;Kehz&6-VB<63-S+R{ZsCkF7v46UzQC zHw5Yo75>{rcZ-gH4vxkEI2!k1S~feAXq`{J{pa+;+|VpDxoktsFq%U`6nn~#vJNRz zFpBJb3u9eFBVwJt2saL*l=jl8qP6qz@rUl%b}j^Qs~8lY?*uXV)wy#8y2|-m_8dl7 zZeCcvh_n-LaN1#rTxvq+m%x-i5*!jSS3F|BEz7)Mx4yr^&fEbO{%j6^u}-nSoH!8G@4<&Q@T3N{2n4^ zmQ({;AFLi0lKbYOXJD#q+5Q3ozWB=kpS06d*TdcJ;m(5xsmC(iXiFJIhEjE~QCAjT zLoyFPTk-tO@*$Ag3gOrViti(+o?YGkEL^m`U`|aLDdnq*PzVRS3={*TBEN;4{1v3< zn?80vZ}%KTM6gr(|Gt_kX76lynHxCI&i>8c{&2ecxDkOPN+t3@qAM!;>-^x*QiH6q znLo_Qz;Lz8@9yDh`Ej>yj+pAVsoNj+n3c!JL?lz=)rGQ{+)SABNXp|c`Fzn3AFUPW&@p#qk?7vj)cX`JkV!QSv zTK9v^0shthoieV|+wC%f1Az?dl9*`W0CAN*4qWMbxmB7gk(#yH_Z9SsIb}L(Xi>E2 zf@4{Ycu@q);q@p+5&f_DkyxrUqD(jG?d6e74j+N_XVP~RRkicJ$o2{P(virB-Z@fi z1PzhXr*0=Wah721gyNQ9)XJV5V?RH_Pr*_8eGQWs)4Xsy?-IC_2=R1v^*CZa13D6e z%9|9UQP=vGtF6U`o59htouE~kf-l_F`YvP6NH@{Kc=qw{PvQq)Dz<@yB=3jCpdr>` zmtU5GC&#m~8fINAq6~-~itSf<^*+h0wrRgvCLgQC9Cdizw_EJR+tOO9eM_LVrU3dR z$&@nPZC|xBvHxrD^!9j%p}*3`9oqAiT+n$a>n-)v(xsJ$H`VrrJ4$&SpHy6yVqe;c z;BJ*KXIiZKDoy=9tW(uTL%`@J2JcGkv+%*US)MRE!RL=A#m6v>>;$IV3Rx0iYdp`u z=1Kntx@|{TJ>xQ>_TA}V9WxjL2VkIT#m=A;IfK+o3q5y~bZrd;Ya>c_p_|=sQGA=B zUZg~)rX2F~3Gl@o6XT*!zaN_hwoDvg=n{~1^NI~cD7?zA)n@BKwxPExDB!3P{i+Jj zxEcm24@ST)%J_l-5rRul>%?iw-S5)vJPps!|W$<=At zbJi`p558wN&N10ma!~-A`T67A>Tw#o%HUW+VBv#S(xO$Eo1(Xa+r}e0|#WOSVVe(NcNY;B?VK`z{@cnU~l$Bq=0Rxwl3f z<1&w=EN}yK-`0&K8NIUIF1+5g*5S8h>!9@3|4M}WOtl?6^hbxLB5#G_(~J_*Fw?1f z{c#X~;e2qVa;(LuGR?5~em>6dq42z2lehV4K z#094K-vzh7s_6eT1~k|SCk@5_uB`lf8U%u3z__{Jz|#M2=8X?);$ooqPhN=v1j70s z;$LJ>0(;=1qWIqe?0-11uVKzy%rHU-8GPzn7zczHh77?b|IZ!$TN1?kAM#)H2Ug2X z4})@(!6$-Y?%cG@|3nzXK|)vKRm@{&XHQc_xt{b7tc36U^# zVP*2g3$m|jqvP=#Z^6zJZ)%l*;r_n-XJHau`kSCdH)yCXFEa~@yfJS!PE*9ml{54R z?>XX6sdCv=;=1W<65q1^})hb|Uu?hCsJzj|%G z%9~9N;3bB9@c>3@jus5b*vY;F^_a$U8B!vyLyljd;8h(ct%!)Qk^iu**gizhyAM0p zykk1X7FO)u6M8l#yLTP799bSFs>|%lP~j3zdf2UaY%hR1QQicSJ~fT_wdm@w`ta9S z(SJ^ne7xXV^{gBMdahIj&&3&-q{s~_OZDyg**}=npGN}fsETVu+rRR1%c0`QyF5aC zUYFM#2sadtn-9Bju-1VR@B4!KtV3%pE(NnMT@v(i{g1{<*-wKLm{bl zmRi+c3@Q^tT@prd3K1?_Aa=Juc8PB52c7~p>ZB&e<(g8f!!qB~`lwR0O;VBFZ358? zOw%eaUa2K2L>3PmoY7?zS1Okg*f}C(U`x5hB#eUNx-DAo2s_@&)8%`b?Q&{^&J&!d z{7{P+4;=bc-&7whg@2ti|49k2s-3(Pv6{X3@U99eN&^fFUQG)rY#0?shxSC+8MZk- zPrwoRMx)Ue|A*KFCe9S09Diu{8zXa|VvD8smzNoau}OGp5ch$pdh$nIJsD|40u)bx z*N{&C`@F{sNNOO}kR8FsT&3TNWju=6gp-FkQAY6^={lN3Vb~Z2Z4DLv^>r-P^b8ka z#kLHAu*JzDz9)SC|R0mfM)fvtz;btd{n<$b_P-;6x+)dqB|phj2=dNc{Xt4 z9;LH$S|u~=hYzlkCbpL9Qr`Ssf3Ob{gV`oe%IJ#8KC2!dx!8W&kgfgp!$|81Ab*0= zkh&oqGtkDt6msw#Sc6y@f|MsvU03J^F0rbg-4xYhDN-;?E6IgYg_O0S%W|a#orn%K zzo=0~EAW;E9?v+`jpJ8Yr6QBH#bK}YR8yz}^dn@_WPy<#32Jn@$=dFkQj2h~*46>3 zFZLZ{YH=qbrHn*Xi8J-vvyHq}UsHdo&nVV36F&Fk-77*GcL)Q06gcZCud?@)MLaFX z4ZZ$E;GAdKuI>iq4Rv!ayMEo*ko$h|+wkglt$H2f>qmDXOez*(<#lPFwVmHe$G9{t>5JLT{4)2(&F>JG3W8-z9w> z>MM3I3ygp@#an+TYKKU6T3R7_N*!aeR{ZXqQ^9ZcAmf;+{6x&O}RDCPBLkc!5_|qkhb-x=qA?+80 zGOk+W46I4$_GAZ7 z#_(hTkB^lGDq7US6nE@gbXNi5g$z=|uG0a$qX@KT(H0D^Q)hg@AV`{3!=rzZPq`6n zrW6N1siI{1xu02!JT$i1>~-e$(4NmLT5<7*1^9=_w>Mu8#-?Md?$75x-!IL)yS1~$ zSHJmsQFCy%el@qXkczs0^}sY|e}9wv$eelb;j9-F{>%U&W+sY>(6`&QTO#YsJV%uN#x*AXy{;R`j0GV#{6+&0GK%p+c34{jKi-XjwI+^_n8fhH zNIGAxi#Un6V;nB6#2P|JQqm+Fzxh33T|qeiW;7X(^ty0OBeaGjT-mouNP9hWO(Wi! zB)q&s8_aeF>#w_XZf;8&_SJJW{rf~%j+FK2BtKIs8zoQ<-@8+CEgki#R@C0PLo_lK zdD7YH=4ytzrEAzLRP$v(B;ArHlAKH2?B`>UwC{SvN2^PHe|_zv-9A6yN+)@Xw6c9H zJtzSd`rxHRWXo%5$_6tB$><7`lei6s=EZ5+1j$IWR+5=#42&A%F)kZp<4~@(6@O_! zt3s@reYcf)eb7I)?r=8K!*$z0jIdaPs0QJA8F3z#igknW>}alJg7&X9Ap4Ka*{~X9 zw1KU>=>F!9o%5^AItu|C4x;5~N|;k(oaJn^OsJtq)ys=)?mmiy?31+b_74X{wp`k* zn0hZTsQOGRb+SI$UiWm_5XTU#Qd11+r53pFBkh%%(8?UWjDz5H<~SF@2z?%%OXBZa z{s?5_W$QpmANi}QNrlM?snmY#Chk?jk#wg#vsex|9iGxN7fUT;bq(e&mU?p)#rw%SikQQUon8=qm3QH zlf~a#IUpPTsxoc}vFQ2{SfYH`w}e;=Gfjv5o>rhs2Eyino5P+M)gB4-ozxi>iqwf~G}-yr=Fp07fSZYq9p4sitMm zJAjrR6il164@=tKQrIhm@)Fsh<25aaWvty+-b)Y#s(Lc>*&&|K$r)MIYm|z|o;hhf zwfiRg&VIciZCt$K)ZrGjC3hTtVP3kpRUg$nSOky%&3h!6YSJjjHJRP2x?t=%PS(mn zV#PiA4-prm>K~+a8-J=@=69}n#?;WD94~Dyt#}pW&tT0~RXHvc*@IH!V#d^fz~+y` z)`;$6W7M#D%~pXYO1`Hy*J3P=ZwLUdsnE^t%|BSGCteLvwp95I5YJT1a1l}K(=z`5 z!#_t0+ze`8{v(P1-+bwVPb;8F{;v8DzcsTP_S1H3@)7?_4x-R4{o_9~`0?-m+5CGZ z|Ke9ZkiKoW_{W3&mmBNTHF>+hLvqg^pWD!6XPd8S^f8(7Bp?J`HK--J4fZC2e}Lwe z5K>VUtQ5?r*}Wr3nDnYk1>v&6(c2v1u~vR zBpMaiAAgBuDJz{poR;*_*G!l6(wfYxhNxMuCMr>flyh0j8aA#J%Fk!(BQx1x1)>Ve zvQhDh#*QXB%a%SdfvOGM(A*!L>Prs5o z85srfjTnF5{yD_ckUctwq({X-hs+YmSC_4$UtV&ypti)y50NE@L$dt_OXykNUx^u^A7)dgGb-DSm%sTW zC)e;fD;st`?3S3!ZOO3|q(ILNn>utjjdUi!Q=H`WoM^#;*@@o7!7aKFB z%&E?3ysrCum;`)?Ih_9k<59A~5q`Pe*u$h7`m%WIp{1KnJOV-n+cME%DPin7eh><=@0&I>=A+Th$v7(y^;D0DlH?NA()4+TN~uqc0+KlH zA=oLT6F2et^4{ZvQi_&cC=KsHSeV#sXwqw>7y!UUVhF`+gpvTONV4dDGjPE=^`M@B zXJ24nkVMoyw^;3p^HNbMC1JL1eKsAJBV7OUb&mhhdw76qOPh z*@XLkJ~!8$F1cMg(k=p;0wNeu3d_Nhxc{8{(MNTZB?Jqo|2aLJSwGtYVLmwUL2wg2Je^6|a*;1OCdWLZAV`)QThJoG{J~8ShQX0;DXkz-Y+3Ei zz={1~?AyzAZxXbr-;J($n>OJ_hNBg+rE^BhO14OYZ;Y6s@&+^rf(45|Ebb01#O^^o$u8~qGV)s(OqCR~DNTCK`jYNoyi zQbs8~c>&G!bym#7W@|DB&sG2NJb*3;HPci;56F5{*;csZB=DmL8aCMi|9WpQEWchE zyYi}7M`&sd#IDE`v4-;8k`*1#i~HBR0lku$h}3PxxMkYDj?p8I!?htp^c6paOh30a ztJ?DL?#PN0hLlL)HJ<*pln8ZCk=bQSNHA=%xky`YwG+-Hw&Ezxf5R(b$E-=sY57RO z7q>~}R08w*-3+Vf5N1oA6krm@7N63b{2+^$j!+=Ax_T)si4?|x*g2Rq;1wG$pl8Cf(EuBY21Yl5(x^1A}V)p#L#qPGoRyXUto!F(cxy3 zAkcnJvoSu~NhP-P7WuTDJC;DS+PUX9H8WLt{^Nsyc5~&xTd0USaX};*+ib^*YMfN* z(hoqxiv35&Idq`aU;Ka|l2@-|o#;Isc)O{O-f%1g56G3j=G2+3vfxv>xx9xJZ;rdI z&jC%OppDw(^%iVHsp&+f~q0*qsQl| zt4(#IuW=LAe9`#6-TOg{xWR1I#jz4D#JD{^_Il`FLAc<6=@m)2KT8x_qL_)D;!9QKtF$RxzJgg80}>ueq!gH+%q`H1R{ z>klQ~0M2iS;5%syS0Aw@7LOzP21n}HPksKgl&Ah55wMarmb2eWLI<6=h%7^2cBba) zjyT%P+j$egdTIfSs}RnXt<7II&?5>7D$SG(#e*>mg(V?Kt7l&QY^TF%F;Z5qtHbZ= z-s|Y`x^@1g(%FbD-uAJZN;UqJ6JnwRezw)?ye!bH3q<}N>+O)gwXJ{XQm zaR}PBl|MHjM7iXti47!CU~mqfLK&B#s?}0t6pQNbUn>gV+a6O?e1{#ORsBJlJ6(fA zOj}YimBracfid9l+6QyM`nY05=;Ei|yI$zk`HvPu6X+~#4z|{4{LXvc4Y8lNx?6Tc zmEwBpu^zLB@>+XO891u0+Me3)65Fq0p>n)^krhrAjM_Othjg;^s){+8;{BAeEchd3 zv3pUsWzy5I6KYsO1NYv#R!3`Z*i=i&&$Mx6VeS?cmnH^HHrDG{=WlUPV262O+y|77Fj=FITcr+cV1nnYJzD#V6?(OYT-5`Tp?$x2e2FYZdQZisv0mWO%q*roD5| z+(z7?q`vEWb$Ib5{Ce9-5-~Qnz`t|#Oi2IF3BgHWAacVbb3{^XFURF?4V-0>HqB@M zLhTFc@#IzCR_=ML$@2%z7EvBvr$6K&na$WUY2n*pU*C!cGCULqZ|8jY_TatOIfm(k z)$#tPMfD6HV+m81pd$wXpr&u z!S;ak1}?w2+>c9I6yGmxU{|@8o(CbD9(<^~w){z!*WS|V|Hfbkb(_^aFUhNhZIcaQ zAEM!@@LgB+o!6>y`EmP$(hLs;s_oR#rTF`^(Zm}(?3Ah5XC(OfmKbS_nL2k6NCUrn zIgg6Xb7XN!RsN}NE<~MeQz*geg8s80qo?%FpM%|JC+jaLUomUrf*U@+_zoD-|X&!v#hH z_FCGYH~Jr5u5e;F9K8LT^s)oB(m2oqi3>`tai!;GmWiuy`6N4T&FO)ZcVR{p3|lb4 zDzp@Yw7O3i*{bcnGl-GOtj6v;iA8Elt2%xHhOX64$&((xRO~u2mrok1S3Gt7pbx&Z zSFvs_{m5Q*wz4E5xy(pkR6k0AM)`8npy;&xMf{n;8XS&U{T{4fNot%`9FrOwyoN;A z;K09I{fx)u<>`rOoXQJaLpel9ogf{Y$AE3)dSK|R=;4KHCrfPD^|NE5l`}ed3UOVY z!rC6`Z2G;ZE^g&MrB17Hzp`!_B&Jt>;5LjD{AD*CbB=#N-i;>Ijia#_Ypx=Gz71k# z(b>BuGMP*@CqIetDpNK;hAN)qn{`7^?NLOEICFGeSe;4&rAR4%7~cm6J)8+gxFb zF7AO$k_C%z&PsB&xD7=}2zCjBUgC~a7ixdw)6AaI8hMYR{EIAuRZXFd#7D6n^1UwL zgDVnLj#mMA)&EHDrFo37$TC$3r%O||#YVk8)gt`K(m&d!TbfwHcMf+mQHf+V=$llr zKjGxTr@%jQ3W%?;R3w&5G7K(=2tpPDIXTOXy0@CAfsO66^Pk3hNz6I2V#?}&L^LUa zxszr=wIJMNsfqwxZB#|Q@UhR#W!O9qqypL2j3{&K8!XznmL3R{NJVdEnU{L3m85wfAtArKzf*`7ZNDteV);gO;T0b>LNtJhpj%cgtZ^6w{&%#cA#71L?vExxJH&+T!zWsG-QB;cR!W{Y(D= z3^omlt?g$9Llo?gRPL{{Vuw_wQ~$BP-T08mPu$Br`Df4GdOVKOO=Yusyg7ZfliVYU;s+8{ zC{XiR>U_SlY`)O2FGYbXqy)<$A)lLE*mS8KlGOCR!ixqH`1xqu=3`uQlAaZ#`?fsjJTD5@R^#uuBn2yOt;b zfK>x28zTy0S-F>oqW=hEIe(*5t=`ExtQsxZM3^v(bt!bih}>~9!O95^I6^n;E;$~a zA@aqWJdCA@O#M4L#J%myL{syf(Hj-2Q=||fkB*Ti_ab>zVaHPtJDjyP#$hN*xfctD zEO7PwkPw;iaTwWDX3wJ@2ozH?V%{S%6w>35uF^+H4Z${O=A+JrlYaj#9C97$e?EqC zg{91xM_)h#iA1Y6%_zW749pJzH8!NllRSFUq)j~ddW>}NOij0R6P#q`p0l=GuFwo@HjWD%>uUyH4x9M83TNh3D(uiRDJf#| zi&&jU6P^AP^LOtW`a+Y`j`awFyDF~5G4q2O{CjSK@m&c9=YJ18GTuJL4gc@`{?5ZG zLE_W)-#=Bj2mx3Po}4dH5K)BXV7=1)NHlh~rp-eS=BiK!g-gPwTMn0%fIey$nGQU9 z+F&I{PKKpzw9&%l)tq4ndZ$=`I=&hScRdE@-nm7;W z#p&LRJ4&IJ{Uw6Wc2{k8=rKY*R`Mqyph$>K#i3EAt>_NwemqW|c4uf;8{{P??N0nN zwR^>|ILOP0cYL@fBHB9N5xrXya}8aaW?ny?u&C5UBT$|$!S+GZ5zg_qf^kZSvO=3@ zn89M&0X8|+98Ix-IJ-ZX?4ABIlD+b|rJ;Dg+S8$d`*sACbRnuq`nzUDAA!f`1ktN3R zz5xGsz6}Ndfd3hNYQ=#QfAZ3S{}Xru03`nd@RK1?jh8vGiH{1koi%ZskCFPnE&55N zi2er_kr>a%#P&Z`?*9Z(a6I_|XQ+mov&(yK3m2C}20kv-Rjx!$K5`O_C-nsY@Sfhs LC%N*x|LXlOM(`Yx