From 397bcaca2fe14be44559d116e1d9833801570cf5 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 24 Mar 2022 22:29:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=B7=E5=8F=B7-=E3=80=8B=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.0.13__changeHomeColumeName.sql | 2 ++ ...V0.0.27__resiImportTemplateLabelUpdate.sql | 2 -- .../ic_resi_info_cid_for_easy_excel.xlsx | Bin 25168 -> 25164 bytes ...ic_resi_info_import_cid_for_easy_excel.xls | Bin 77824 -> 77824 bytes 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql delete mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql new file mode 100644 index 0000000000..b70fd29096 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql @@ -0,0 +1,2 @@ +-- 修改所属家庭项label为户号 +update ic_form_item set LABEL='房间号' where LABEL='所属家庭'; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql deleted file mode 100644 index 28ae0153da..0000000000 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql +++ /dev/null @@ -1,2 +0,0 @@ --- 修改所属家庭项label为户号 -update ic_form_item set LABEL='户号' where LABEL='所属家庭'; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx index 3fc8d64c974fc70c80036c4fe6ed0a69445a7f63..5a2c56972a0cd0c6c9dd250bce898be9044926e2 100644 GIT binary patch delta 9968 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�E-6ZoAOk-RK2b+wpxswA88)%g06R~a>Tc|q!+u# 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 Xp9|~d?9_jz%tOd6n30|h|0@3v7k>W| delta 9896 zcmZvibx>SE)2|mN1PB(~H9&B8CpZLmx8Uw@kl@Zj2=4Aqu;3QlCHP{&-QkkF-&gm( zRd@e*`ZwLZbL!0YoIO?3BfU@)y-?Li(69$4`0Zd+Xc9nCwuc$F|0HlN2eMkQ|6H6? zmc1!0;*jg{{VQZe-DWyLeAliuBHQD7e5j75YgsTV_t@lnqq8~|S#sMrc5ck$ z!U7LmL7r+OdWq*C)Q}4LkRQR3E9Z(C#Ih&f(2*`DS~7dms<|2MH0oTnD@KM*i5mJy zGhrst!WLj>rq08)7WDtRpXw?_f32LvY*JMk%hn&OMN)m@$&l`E6o?n%oSilrZW)5* z6EmWqstbZ0Kof(WvXrxe1-wy;#b55SmFUJOS@TB5*duk!-s(p<-=xIs^lvz563j*7 zatd`JEbFxP728o>=s5}-k#cV%eV10__Vx1cZUgFQI+LtAy1sv@vrS%!6fTeMo`sLY?_;i0SX@MEs@kyKUOwYbR zOuK$DJJbF9r@J#jMP2L!t!yB?qiZ&)4O zr%x#MDTbsR(j(O7-ycqH2EW<n%AtTB`FTPGHkc5o)b~EPQRDSw#An!PuU;d$#s)9es$9pFKj+6D zZkut+-_-68kn8Q3(UiFe4zWC6Eg$;oU0omC#ol}C%L_VI&U&;F(Z02q%Ef|B)Iw_I&i}MZekT-l{rQJxwrZ!{kwR${Bx{g3MoggeNCE3aaa=Y5p1JG4&kiPm)w#(@8Q z<3*rhYr5RU;&_c5aLk^zMS3fw zIZ|%U*JXTO#-DKxvOIJpv2zXFAK)FwKE54xRpxxB=j`M6ZB%TQ==xytsn8RWx;4$A zk+xECz3=PjLfL@JZzfo_^V!|xbUO^4VQIb2itW(unnEbgfDprzA$6?<|mO~nG)(I<=+g&@L^#*f#aOQKA@Mqg$sqC+| z!u4`X~4OB_J@R3%y6-DZ#qY* zz;Q~{q0=9|WV9W{JZ^qX_&>_yB`G3IpGtRBD=P7vdg63KezQO_$=)G*nhs)$xlmkL zg=r^pqDR{G>NSCT%fkX)D0W-)DAw?;AlhQl{MNJY0gMTm7TJN_4V`~=!=hgsZ8{MSgc6|zS3Yo;zoNLfF7=^4D@4&(IRAVvJp zFZSVcDbs7#=sA9jlybQ|!B}x0dwc;eN@FJqT6RhRi6dIHJ+pWMf0Q#nthDrV&8J)$ zhn5(JNDYH&iiERx75(2#$DK#)LQcaMWJUZWPQ0&%?Y~SN#-9!IqK>UDhKTm9u27GG zygwF^YroGDpVniF+{nZvkrzz{1;tQtod)A5LZa}TM&j&|d5i{W#l~;}Cw+4CV>JRZ zv@|^_!rV;RaItg`HRn=(12#wqSrhUPlR*J7V%+n=xFYnNpk2!k-fe|JLW3E1!#(Y=bc!B`X;IrJpJf*|MLYh<%uFB8qG0Op1LgI*T7; z)Wf7EM4ahei=&+WN(C+KnAj<7QVd~rS`Y}N|f+uX{S^FnK3C;;brIq8I;(ELtGr_;EZF;!Hc-%47q^)(Vt$WPh8_8P1I z`2T{-Qi~EnMF4MieWDf9!S9M}SAoPy|B`I?^_LL5Als!QaUwn^+r=eudOpn=MoGK! z9U0vJ$f%+A%e&=Vds|FFOb~*#C8j_k2$@+ItGpJ3&>e|YR#MHh6!k<8Cf@)q29?IP zHgjc~W6<;Y`V@~lWEwJv@ik}+hUbVf{@bJRrxQY)(|OcdC>CpU`%7a0IgNy#oN8F zl`-jQ{l#l_CBKOdI#_O$B0#ioN8m4f{{rSO#Qx%6phlQX<>DW>6c))B1<*fGwl3r~ zHT1u@MmI{ijmyZ)Y{mhXnQvF(F7*+y5>{mcM5nx|l%%|>;E<$GqJ_!!+qbc1Y3|y= z+>~867@?-OBAao@LNbI2n>68KPUQ{a=}SM{a%tSFyYjC*D2=nyWwn=LWBkFDkDq)f>&{&dS$hq$ zGOuh*Bm`09I#Td_7g&`=jgjh)hOCE~{+9axNX!5A8nyuI)|3bX>{|&zCV#)nU5J-V zNcg%DQDa^=;{OCv9f!JHy5^-&3*UA~Ix*{=awG)p2UflAnC#c=e~_DZiiQ}re0!bj zon?PU5XIpD$8=Sbg3hXCvi-+zRqPB?v({&JTfE=RNo4Dn7P_YtP?DKcGs^&2?;%YH z>1~0`VJi{8|2!YY!*vMSq8RK$t0)8&{je4(o+fFb3CaVO36|1rSwD=BJW#-q_y;m( z`M#r%3mP@W$AL4%RhquM4+BSCR6bvC6sZV{VrW!W$2(+BJ%-OrAo|MM$LSpwcGV?lnA?YBbip)f99_MYY*{0-up?Wq zNppBarCpvVC@Eh4-t7#7LH(_cdpPz%fg(COec?D7x^>}ab_R9%JR3LQNV@o4xp{K- z*TMJXnrUd{^I?YJqG7*D1Cx-*oFWmiKYkq~BG+s}BfkkVyb}%MCk<3XCOZ#9#Af@7 zNLeZoZLERpoIC@sV-&78zS(Z{LSOSsTND<*p-ks5BX$4MTJJAq_5YII;4j}A{^fz8 zDDY~28T}oU8UJOZ$zNKV{-vy$Ce`{r@b;u_~@!=r8a|L1H zCUH5(kTuI9%Ulr9dj4P#==V!-;MYy;BfDM|P1UVdlbP)8 zINt(m?FII;Z-;x2qr5Y6csNsoRZNtdJ051M4&@G~a~v-QnQh>tqG(3D<84U{=&@;5 zC`@KjbU9+9SstgjDn1W{h#gdO^E5^&*o)#vhe$N2E-}XN200qJTksR@Q+VgPjP5Vk zVYB@IE?B^Lfs;q&xKW!ew801O0;3|5sYeYS>^re>A*8_x?N^CULG zFJr|vHL(ZtwDI<<>PQkeB=9Qwuv-pA6{|{w`eX6JJn42+{+0CaX^t|`ia%|rVw6ya1Iv?U`sdWuQMvliIMB54$h|fjJX6};ke3=EH}qRQ?I-*k^A-R z^}!rGFE;IqM`xrWP0NcO$JaortKQYEMVWQcH<8Er1Rm?m$HjAZU-{V$Au|JK&;289 zZy_`N7`@M^LvvNl!DG+_v{}S$|dCTcN&^cqUr9&sa5y) zXr4;puUxD@fARJR7B^sfp;D^Bl}$w>uq;Z@60LoiJlgG^68uh8&uB$#nQ*Y)wMP9Znh_s zI9uaD8L4CuH%g}gGxU&!w9%+C$rOHu8x2)odT)UG#n zZ#x=E;qe_qMxzGQIIPeWXNv>Gg>!tagS6HA;e2^ujQzdNYL}L{*xYOj9T(vp zqBRF}kD}E^x#hhjmoG+dV0EA9P`C)35M>lSV{Niur4+> z2MOW#s8+uEh+O0XvlT>?I)nsCG~Yd42Wj-<{-CL^er~)Mhsx{Ds3F`3!%CYjjn?ss zH1H_X^oEuxm^v#t9kX;t_df=Gl}>r2XKiYbz*GLAqnjAaUOz{S4ku&hTa8>dr0eNH0!cR0d~L0S4U~ zS1;y7F=8h6*q4>B2#MX*$%%zVE9DLrj4R|w54#wR&xvL%moWMy|U4eNStTAhw5K(6u@Mlq}u?JM3_ zRGHMlIRJFyk2;qwz4hA=xlIB_5Di*+L~6(-PJ$nOym0$0ihr@d^bXH+J3p&)hQB3; zbcWYqwP3uyV7ePhL1l%7;m4=Siys40)@DY^&x7^wCm^zVx6Yrb!gn>ZJRN4~oyg=m zcJCYOL7FY$pF7_n5JZ!7TTz^X^GONzLb<<)?RH>>ejEs!TX zGHliZNmBSYeSf$c zIJJgh$=liUU#C6@>MOdJQx8J<72k2<3q|d`;&;XZ;-kpo+y08Tw@exh`Pw*$ca4XN z01MC8bQz<#oCLC;yE9CIUc^G1ahWu3)CLtAsNH|6u)v+EZQiDl0EZre8TZdh6*(M; zNK$ndAM_i8_Dz1~q5|docErFE00oNf zUNWz04WII4MK(GUk1mlqX7A_6$Ng5R6NKq5G)^VMi;%boYyz9)jzSySIwnCO;ANow z?u29{Q=sGaw&%jYxAc_2+E7nCUxtfWGd~yp^F}-LkKhfF0IEEUj~G~O0x9?+M~i~L zj(f&pPIs9|MvsLYgF_38;rLxCHj3dkc1ofsxnu2vj~{S!ycB}v4k+ksWX~inU;KEz zpV@E(v{E1q*#r-awMoU1Y?P59K-*4Is@&~7;KTE<&9nmmYunOu4j$2aelC&xFe|~a z#e+w*;sv5NX_4~qGo#9qS}uI@rL5ub{Dip!U4^q44+s%3zljKQx76}u2&6(!B6rWG2$Hp6;#|O~$lb1U$@@ro?lh-nHzxR*QcUUEe$&HxK~&JtORZBAEta+{4T> z@tf&zqs}|tGFmwgIy9}Hi)~~25p5y5mHGyqI z;WBOwXX4~7(mH=AAaUx=J&{7e_`btq-y-0j{9yQ|L)@Y+^hUqk1Ci%qGw4R|+Qt2C zRZiQAMOJ2(ujkqA;T6J3=F9GLUtaRX8vh2Ycx(bZ?KGA>***G4z$Doa1uJD4F)DCY zFFt_>xK3WQU&Hi;t?Wf1Q<1$zC=_3n5E=I$vOKqZnm6c@{{hL>5z(O7Al%F7jNQJB z*t1ll#gjJQzC#%XLA9v524Jsq3!BOn(y8T-8x4A?C)VcE;(OCYyg$!JwW5SKgOQB!T5?l9&uc%`Md8p7f zu{Y3Y`ct6pD_e#;TOrxd(4;oI1d_5(oKb!#LK}g+513aNPCelW$P<}or7>UYSmO93 zQMX3og7Ok60!`2t@=z*F>SW9Mwd~^nYK*?U*KR7DODDT5!<*`^%u2MrH$d>l@e9=d zJz@w|*c5iASPGOz0)Z~UM>6KtR9F`yJS#;Ho-K-5nPY1tG12<>?&p4t8Kb&i9^{*U zyV0inNFkE8urv5V5OMvOmv^Mhm^BzhDOr~SNoxEwq`Q2g2fXN5Fed+mZA|%{)Tk;5 z++-ac{YWc;Xp+;Io=~&-{~lf?k%er4J7l#0DeQOhiobw_b4Eia+tsl6qhv_%K5a%y zo|!X1-8giqk%v(5tY*cYlp&pOrd;~#SDH(M=&v;D)*-XIPhzEMsh|CzJ(%*hn*KN> z9Wa+mW?jx&Zx6Ze9|~mrW--ohE+X_vEV9m@VmF#qV}|1^sj=>+rqA~qJoVI!PcG-w0ptVHFkFe$VKTst=4@=1p(v0?C77AHw$t*OFgG<^wRq`YfN#r)# zS+?H_&&o8RBvII=Wz^$O;X0r~xs(BiGD(9pYOwk)BuS<2#@4gJ(nlteB(BJ`OdRmx zY;RR2AJ>44JLf+Sg=LIijyN97;>7?dnN}C}KBYH$l^keuStfgje{d_qvKEN-beJ1y zs+cAh8N|_D+@Rrg`(aX_M9hU?+hRjP6zBN!WrF;xnDKT+~yJjgs6`Achi*GJ!$4_x3VFNV{iyB!mlg@Qzeg4Dcvj0}~dB##+PKrj> zqldSD&%ra5ktEKz4^qcjb(n(9?kl3fm3(fYxh609wpCom97JI+FH1Ec=jxB?f#dbl z(&YmYgMYBg3~3)pwG)9+I}5<8);rhAWIyNzV_&Y8P6I}0CSn+$m~|h1_Ezq7L)x1( zz+El*Y3QpGpL~-<#1`JcCFL4I*kLdKJy$vOi@WqAx4iW2MyP z9;6)VQHlc>Ki{-(2(CF~oe1GxS9KUptSpZP3W)iN6doxRGYzv|zC&fsxRwYJ5ClL+ zih}|Z(ai_&!~tWKisV zYc+Ay_i#vrBpKSRYr_rv7Fa(%>2E#dPEs%>#%9e6{?*L00c*Maz=mf{Zu0r1u(dOGzvNqYjS9CMsa9d}uOo z0}x3lr{7ICKX~u++x;QA^f;BCMLVv(Zhpx1s~5xXZn%OEB%VQ-AwYZ30*nbcfHyXA#Kogn7325TOy>g~$*0|LB^hv6BA3Lfa_o-PB_gKgt$rU%6 zg*@`p>Cn5&T))SFurMaS8W0TP1D+{LSPibb2fTRwJI9|3k(l(P`aP~2v26Dau5m_C zkl5a{oN$=VJrHRd6+haO5IT&7FENm=0O|`8AafB1MP7Y%90Se8TI0qc3MSKa+t3D% zBQ1D1o6E2UsE&97TGC1 z&M4g2$RN59$~cNGf`uncNp1|8@23xYGffWbOWw$<`L*oWfnD(9>mTqAQv}0z{LRS7 zL3sGx{kb&O48fjlShWv8=lV?LVTx%^TIqIdG!F&e1}rqMA=dS(Mq<0bohclTB0YWx z2{3S>j=ELh)34(h)#QY0zsck;LlQ8)#jgzrkic5GQUwj^WXB=C$4XBzH3Bl8Re5D?zgf^@p;=sk`fA$GDk1>d|*5FaZ}%>s~s#Wkj!YkS)9QiPcNap zX*O-n+3Wrb&KPYQpN0hws~X1{3=>!?3}~;KGgJF@&9rSq z)8h}9VWsf5fISh#;E8rIxQXaa>aYNA$iM=%5hgVHC3}%qq{&boCtH9AFc><7_t>|! zgMv_tJ;hHwK9>XAA7@!Zo-wk8H0?wTFZt`D)S|vv28YfH1*;EHb-I+zsSc?%O#g~w z$ofLF#INTdN=dhH+S3Y1gElpVw(Dr zND=Nx^ds7*u^cB8%wh!I?#iS3AQ(cDxK`MfQ;|}@!f~o=BR^pib_L7sKCpe z?o!PS>>D~`Y??S?q#8S67@Igxb!|c526yts(5mtzh(giYL*xW_bb_CBQa-SLo5*6$ z>`^-UR@cz@=AhiMLgnY%1^sUda$HIdIEbn$3W^)^micm>98c*k>fjgyQW~R@v-lA^ z!;iC!!f3)jpM?F-+Q2=EG+9{+#6lT_e!M)7fQ!@ZzUkTY&<;)Sz$OiQAB3j2f2RmM zF#a}fRIv!ucc)4Q1$T>}>H3>C%KWVopW^!|Dd-a{)}ayGW-?sq&Ug3SmgEl~bedIg z;7es`T?x%PwT_!FFp_6|H4!A2_#x4kHldlCn`C8zUuLV9y#4l;!ZzCyI z6i9q=hc%{O&-)gWHp_0q`k=~w{a0D0d?`*%l|F$*S{rvRAK(v|+Jc)DHk=teFX$5q zqTQw@+gR(Sy&e!2^`Hy!jJBnvfzt7=DqWt0pIO66C=hV+SzBZeJ5JUYM&fB*!onZi za?Xz5cZ^v^`^@os2aNIA`%LkB`^{4$2kKwfhdnuNuoF5@U$>iz!mVi^gShY$QZ+j( z_J?GU0qiP$@m#D*bpknkv1~Jxd)mZTuf9}Ss#?5T1m6=D{~xN_Phh%E3bTrPFIH!m z=jU@TzSr$@CG_7fYF~6CGQj4q&xr@CfxGz-?%;@_dT4#4zBRsvu zg3y|ThD1>$z9`#ZqHj@i2GmYd_AHAzC1;&0(tcDzLYce11=lp@)K-*y+H&|6c( ze&-#bs<-ITV9FBE4i%OX*MqP{*xq8lZC>=e%_d^$cu1|$%Z5^2m;kfd-~k~H{Dh=6 z{i1SL(#dBaX}$AIGSQfLdj2T0b%JkSIHN%5NXcKZUr68&+`@yhn2SgZ>5|c6d?_1z zH{z8#62QA>U@}M^vpL&*P%jdX3PjJgKo&vjZh9gw#T@ zGmGpzcbt*q;3twlf57TJPb;9P+!N2s%lKKt>CZNtU4dP zbd5!Y#?&IB6OBy4vs|Mh9d)B3Ev7id>Sa1wRZ+{K%Xe?%@auv#@?oJrX@d>4--Cs9 z>7eYv*1Bv^U~rZ$_&@zwoO%OLt>9-pPUuZd@VzD>y^<^xG#2PTokRciTK@s`&->a^ z1cCyQzH$ZZt4~Al@8AOYwa>^A1VZ^6eEs|cdIqx?NsiW}0 zhH&q}(}qmYi6s9do)Hst2<1O%V8jHq363?AfL3Ju=QwzcEwlcUEXMEQVRZja^nU>I CiQ|$0 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls index 99376d01a939f088169b23d518de99aa810e6c33..af52e02e95fc8b747617864bd1c6ddb1e129f178 100644 GIT binary patch delta 1236 zcmZuuYitx%6h3F>&g|~YzPH(#-R(ZWRKOUTih%?}cWt}=u%VSl5lVroX+u)6RDy|y zglbZyZHkejZK9+E(;o=Y)Qrt454$2_NTd=$@dwh@A8II%(pa%rt#@X(R;8KDxnJgc z+;h&fj(@dA7VkV>Qyz?LOO zpaA?dte7g@QYO?G_a)V0UYk{I9+z&p9CT=2_Q5=BdIPgJzUlMzs68q$N1mNgHPop( z-(AWnqmMl9CA8BSLodDV)I#omyp4^6@xeH-6_z(dgPe8FvX_8QlF|XP7OT-Mr$$#@ z*2HM1xT}~-RX^3cV(8*rg6=py7T>DMsF>>9mI4K{i3feYpc>@8hUpEymxNmm+`GBu zoQtA|=Z9#gJLnD0y7T?eekDwNEPB=LQ8=0F&Ou+hbN_==#$WCujJ4DXWyaCKlBIZ? zEl#W77)9G{|Rd99%iUfbzN zS@e;}fa!MNX!T&{@v8qO=wN(ovUa?@E%}tx`tNid)*UF1U=bCTo3Sf-t)Y$O(akp| za)BkAUTXY*U>Mqd%dwqJpYFbwjo!_%i#B~R4?92?_${mHW_hJH4jzE$Wp~>_ z<^c$H{>ZYib=?_32tP?5_8m2bHmnqd`7EYce)xrWT{k_BRF#k8l70 delta 1168 zcmZuvZD?C%6h800?@i3T`MilYH%Z&nft?j;oI(fg$7<4o5=>U7uB#<=%1Vb5-9-Et znsim>I_JlZE`Rz%QCYV^S9sBgUoE(a6NTXhis*XlKqZsfRaa~+i|5{S!!Is5C+9rp zdCqw*w`B2>#U~ae`NUKYE=!-{yd1$6C5|N?$0hnLa~+$wiLKG`0l$?E z>`)AB=MC=l@Sy|%xR4~pGNM8TX-$2p&iX?RSH;)1HXZ*I0A z0x_Icqtu=D*)gD{oXHJZlaouD%bsN>ULe-QN_B%%5f%>6-ix&$z^kE9Su1P6Jq{N1 zx>ywRj%LamWd;WPwtl}i#Ul8UHyZO@VGayTCMT1?*E;uvagtE|GI|D@JDNL8fGGzJ zVbRx&6*a(unDnJcF;CINUulQe!5-HF%ujWz?KY-f))@_j49%eX;*JhE^+&Pb)!pqY zwe801h%D$fPSzpI;Y`+-b?C9ol5%icmUi#?gfd(X|+ z1=nnTYT)03aoDv`NB2GW@nio*!%KB^_2v`*gC50Gv?YVHnQZiDpbultvd6(S=UmwX zVBm(%B25ex5_rDTM6GKT8^^Y;HHrjm?fqh)tEjkA82~R}vf84`#J<)Iu(})b)tuOt zz2Nq1;Gr%9jUJCj3~oFwNx@BoAHhN)Ct5cBB1sdyB47Pd!kNC4>h%u*>>LER=OKGW z6bgZ``o@z0+lB!C+(W%3v14a7%F@_3lBGB{atFnQk$ELedpNSUZWN6#e8%MA7eQFH z{j%P-a#gGhuw@jW_ByHjA&LiX($%Af0e%|?cttop@%GChd8T3$Uz63np8$lu062Eq zSv&o~XhQwyI{@VefH!}12v2`=D#Xrp8nv&*zpYlgmi$ zB-Hm{awp_#X87DY5%i_ T4pnxnVtZU{Yi02|=63%DTSIa-