From 0d98a51b17e62d12d6710860b0772f1633c548f6 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Thu, 19 Nov 2026 23:19:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:sparkles:=20=E6=94=AF=E6=8C=81=E9=9B=86?= =?UTF-8?q?=E8=BF=90=E5=BA=94=E6=94=B6=E8=B4=A6=E5=8D=95=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=B9=B6=E4=BF=9D=E7=95=99=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../export/ArBillWorkbookWriterTest.java | 78 +++++++++++++++++- .../export/ArBillWorkbookWriters.java | 1 + .../export/DefaultArBillWorkbookWriter.java | 31 +++---- .../receivable/ar_bill_template_jy.xlsx | Bin 0 -> 14953 bytes .../sql/20261119_ar_bill_jiyun_template.sql | 22 +++++ 5 files changed, 115 insertions(+), 17 deletions(-) create mode 100644 bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template_jy.xlsx create mode 100644 bms-back/sql/20261119_ar_bill_jiyun_template.sql diff --git a/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java b/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java index 6e5b1c6e..ee1866f3 100644 --- a/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java @@ -5,14 +5,18 @@ import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.io.IOException; +import java.io.InputStream; import java.math.BigDecimal; import java.math.RoundingMode; +import java.nio.file.Files; import java.nio.file.Path; import java.sql.Date; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.IntStream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; import com.bms.receivable.domain.ArBill; import com.bms.receivable.domain.ArBillDetail; @@ -176,8 +180,10 @@ class ArBillWorkbookWriterTest { template.setStorageKey("templates/receivable/ar_bill_template.xlsx"); Path target = temporary.resolve("default.xlsx"); writer.write(bill(1, "1.00", "CNY"), template, target); - try (XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) { - assertEquals(1, workbook.getNumberOfSheets()); + try (InputStream input = getClass().getResourceAsStream("/" + template.getStorageKey()); + XSSFWorkbook original = new XSSFWorkbook(input); + XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) { + assertEquals(original.getNumberOfSheets(), workbook.getNumberOfSheets()); assertEquals(1, workbook.getAllPictures().size()); XSSFSheet sheet = workbook.getSheetAt(0); assertEquals(21, sheet.getRow(4).getLastCellNum()); @@ -189,6 +195,74 @@ class ArBillWorkbookWriterTest { } } + @Test + void fixedPayeeTemplatesKeepTheirOwnBankDetailsAndSecondSheetWhileFillingOrders() throws Exception { + for (String code : List.of(ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE, + ArBillWorkbookWriters.JIYUN_TEMPLATE_CODE)) { + String suffix = ArBillWorkbookWriters.JIYUN_TEMPLATE_CODE.equals(code) ? "jy" : "gz"; + ArExportTemplate template = new ArExportTemplate(); + template.setTemplateCode(code); + template.setStorageKey("templates/receivable/ar_bill_template_" + suffix + ".xlsx"); + DefaultArBillWorkbookWriter writer = new DefaultArBillWorkbookWriter(); + ArBillDetail success = detail(1, "P1", "1.00"); + ArBillDetail failed = detail(2, "P2", "2.25"); + failed.setBillingFailStatus(2); + writer.detailMapper = mapper(List.of(success, failed)); + when(writer.detailMapper.selectReceiveTimeRangeByBillId(7L)).thenReturn(Map.of( + "minReceiveTime", Date.valueOf("2026-11-05"), "maxReceiveTime", Date.valueOf("2026-11-05"))); + writer.detailFeeMapper = mock(ArBillDetailFeeMapper.class); + when(writer.detailFeeMapper.selectByDetailIds(anyList())).thenReturn(List.of()); + ArBill bill = bill(2, "3.25", "CNY"); + bill.setWrittenOffAmount(BigDecimal.ONE); + bill.setUnwrittenAmount(new BigDecimal("2.25")); + Path target = temporary.resolve(suffix + ".xlsx"); + writer.write(bill, template, target); + + try (InputStream input = getClass().getResourceAsStream("/" + template.getStorageKey()); + XSSFWorkbook original = new XSSFWorkbook(input); + XSSFWorkbook exported = new XSSFWorkbook(target.toFile())) { + assertEquals(2, exported.getNumberOfSheets()); + assertEquals("运费", exported.getSheetName(0)); + assertEquals("汇总表", exported.getSheetName(1)); + assertEquals(original.getAllPictures().size(), exported.getAllPictures().size()); + XSSFSheet source = original.getSheetAt(0); + XSSFSheet freight = exported.getSheetAt(0); + assertEquals(source.getRow(0).getCell(0).getStringCellValue(), freight.getRow(0).getCell(0).getStringCellValue()); + for (int row = 6; row <= 8; row++) { + assertEquals(source.getRow(row).getCell(2).getStringCellValue(), + freight.getRow(row + 2).getCell(2).getStringCellValue()); + } + assertEquals("客户 & <测试>", freight.getRow(2).getCell(2).getStringCellValue()); + assertEquals("2026-11-05 至 2026-11-05", freight.getRow(2).getCell(14).getStringCellValue()); + assertEquals("ORDER1", freight.getRow(4).getCell(2).getStringCellValue()); + assertEquals("001234567890123456789", freight.getRow(4).getCell(3).getStringCellValue()); + assertEquals(1.00, freight.getRow(4).getCell(18).getNumericCellValue(), 0.00001); + assertEquals(2.25, freight.getRow(5).getCell(18).getNumericCellValue(), 0.00001); + assertEquals("备注 & <快照>", freight.getRow(4).getCell(19).getStringCellValue()); + assertEquals("销售价未匹配国家", freight.getRow(5).getCell(20).getStringCellValue()); + assertEquals(IndexedColors.YELLOW.getIndex(), freight.getRow(5).getCell(18).getCellStyle().getFillForegroundColor()); + assertEquals(0, freight.getRow(6).getPhysicalNumberOfCells()); + assertEquals("银行信息", freight.getRow(7).getCell(1).getStringCellValue()); + assertEquals(3.25, freight.getRow(7).getCell(18).getNumericCellValue(), 0.00001); + assertEquals(1.00, freight.getRow(8).getCell(18).getNumericCellValue(), 0.00001); + assertEquals("S8-S9", freight.getRow(9).getCell(18).getCellFormula()); + assertEquals(2.25, freight.getRow(9).getCell(18).getNumericCellValue(), 0.00001); + assertTrue(freight.getMergedRegions().stream().anyMatch(region -> "C9:E9".equals(region.formatAsString()))); + } + assertArrayEquals(zipPart(getClass().getResourceAsStream("/" + template.getStorageKey()), "xl/worksheets/sheet2.xml"), + zipPart(Files.newInputStream(target), "xl/worksheets/sheet2.xml")); + } + } + + private byte[] zipPart(InputStream input, String path) throws IOException { + try (ZipInputStream zip = new ZipInputStream(input)) { + for (ZipEntry entry; (entry = zip.getNextEntry()) != null; ) { + if (path.equals(entry.getName())) return zip.readAllBytes(); + } + } + throw new IOException("Missing ZIP entry: " + path); + } + private SummaryArBillWorkbookWriter summaryWriter(List details) { SummaryArBillWorkbookWriter writer = new SummaryArBillWorkbookWriter(); writer.detailMapper = mapper(details); diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/export/ArBillWorkbookWriters.java b/bms-back/bms-system/src/main/java/com/bms/receivable/export/ArBillWorkbookWriters.java index 74c8afe3..503b5269 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/export/ArBillWorkbookWriters.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/export/ArBillWorkbookWriters.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Component; public class ArBillWorkbookWriters { public static final String SUMMARY_TEMPLATE_CODE = "AR_BILL_SUMMARY"; public static final String GUANGZHOU_TEMPLATE_CODE = "AR_BILL_GZ"; + public static final String JIYUN_TEMPLATE_CODE = "AR_BILL_JY"; private final DefaultArBillWorkbookWriter defaultWriter; private final SummaryArBillWorkbookWriter summaryWriter; diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java b/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java index 9c323736..c0222299 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java @@ -31,7 +31,7 @@ import com.bms.receivable.domain.ArBillDetail; import com.bms.receivable.domain.ArBillDetailFee; import com.bms.receivable.domain.ArExportTemplate; -/** 默认及广州应收账单模板共用的 21 列明细和银行页脚排版。 */ +/** 默认、广州及集运应收账单模板共用的 21 列明细和银行页脚排版。 */ @Component public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { private static final int TEMPLATE_DATA_START_ROW = 5; @@ -79,9 +79,10 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { public void write(ArBill bill, ArExportTemplate template, Path target) throws IOException { // 样式表单独读取;不加载整张工作簿,且不依赖 styles.xml 和 sheet1.xml 在 ZIP 中的先后顺序。 StylesTable styles = readExportStyles(template); - boolean guangzhouTemplate = ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE.equals(template.getTemplateCode()); - // 广州模板的样式编号与默认模板不同,使用其明细合计单元格的完整边框样式。 - int detailStyleIndex = guangzhouTemplate ? readGuangzhouDetailStyleIndex(template) : TEMPLATE_DETAIL_STYLE_INDEX; + boolean preserveTemplatePayee = ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE.equals(template.getTemplateCode()) + || ArBillWorkbookWriters.JIYUN_TEMPLATE_CODE.equals(template.getTemplateCode()); + // 固定收款信息的模板使用自身合计单元格样式,不依赖默认模板的样式编号。 + int detailStyleIndex = preserveTemplatePayee ? readTemplateDetailStyleIndex(template) : TEMPLATE_DETAIL_STYLE_INDEX; if (detailStyleIndex >= styles.getNumCellStyles()) { throw new IOException("应收账单导出模板明细样式不存在: " + detailStyleIndex); } @@ -157,7 +158,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { } if (TEMPLATE_SHEET_XML.equals(entry.getName())) { output.putNextEntry(new ZipEntry(entryName)); - int rowOffset = writeOoxmlSheet(readUtf8(templateZip), bill, output, exportStyleIndexes, guangzhouTemplate); + int rowOffset = writeOoxmlSheet(readUtf8(templateZip), bill, output, exportStyleIndexes, preserveTemplatePayee); output.closeEntry(); replaced = true; drawingRowOffset = Integer.valueOf(rowOffset); @@ -184,7 +185,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { } } - private int readGuangzhouDetailStyleIndex(ArExportTemplate template) throws IOException { + private int readTemplateDetailStyleIndex(ArExportTemplate template) throws IOException { try (InputStream input = openTemplateStream(template); ZipInputStream zip = new ZipInputStream(input)) { for (ZipEntry entry; (entry = zip.getNextEntry()) != null; ) { if (TEMPLATE_SHEET_XML.equals(entry.getName())) { @@ -199,12 +200,12 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { } } } - throw new IOException("广州应收账单模板缺少 S6 合计单元格样式"); + throw new IOException("应收账单模板缺少 S6 合计单元格样式: " + template.getTemplateCode()); } zip.closeEntry(); } } - throw new IOException("广州应收账单模板缺少运费工作表"); + throw new IOException("应收账单模板缺少运费工作表: " + template.getTemplateCode()); } private String readTemplateDrawingPartPath(ArExportTemplate template) throws IOException { @@ -274,7 +275,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { } private int writeOoxmlSheet(String templateXml, ArBill bill, OutputStream output, - ExportStyleIndexes styleIndexes, boolean guangzhouTemplate) throws IOException { + ExportStyleIndexes styleIndexes, boolean preserveTemplatePayee) throws IOException { int sheetDataStart = templateXml.indexOf("', sheetDataStart); int sheetDataEnd = templateXml.indexOf("", sheetDataOpenEnd); @@ -288,7 +289,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { removeSheetDimension(templateXml.substring(0, sheetDataOpenEnd + 1))); writeUtf8(output, prefix); - String headerRow = guangzhouTemplate ? templateRows.get(1) : replaceCellXml(templateRows.get(1), "A1", + String headerRow = preserveTemplatePayee ? templateRows.get(1) : replaceCellXml(templateRows.get(1), "A1", StringUtils.isEmpty(bill.getBankAccountName()) ? "威狮国际供应链(深圳)有限公司" : bill.getBankAccountName(), false); writeUtf8(output, headerRow); writeUtf8(output, templateRows.get(2)); @@ -316,7 +317,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { int rowOffset = lastDetailRow - TEMPLATE_LAST_DETAIL_ROW + EXPORT_FOOTER_GAP_ROWS; writeUtf8(output, ""); - writeOoxmlFooter(output, templateRows, rowOffset, bill, styleIndexes.generalNumber(), guangzhouTemplate); + writeOoxmlFooter(output, templateRows, rowOffset, bill, styleIndexes.generalNumber(), preserveTemplatePayee); String suffix = shiftFooterMerges(templateXml.substring(sheetDataEnd), rowOffset); writeUtf8(output, suffix); return rowOffset; @@ -419,7 +420,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { } private void writeOoxmlFooter(OutputStream output, Map templateRows, int rowOffset, - ArBill bill, int generalNumberStyleIndex, boolean guangzhouTemplate) throws IOException { + ArBill bill, int generalNumberStyleIndex, boolean preserveTemplatePayee) throws IOException { String totalAmountFormula = "SUM(S" + TEMPLATE_DATA_START_ROW + ":INDEX(S:S,ROW()-1))"; for (int offset = 0; offset < 4; offset++) { int sourceRowNumber = TEMPLATE_LAST_DETAIL_ROW + offset + 1; @@ -432,7 +433,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { nvl(bill.getTotalAmount()), generalNumberStyleIndex); } else if (offset == 1) { row = replaceCellXml(row, "B" + targetRowNumber, "开户名", false); - if (!guangzhouTemplate) { + if (!preserveTemplatePayee) { row = replaceCellXml(row, "C" + targetRowNumber, bill.getBankAccountName(), false); } row = replaceCellXml(row, "P" + targetRowNumber, "本期已核销金额", false); @@ -440,7 +441,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { generalNumberStyleIndex); } else if (offset == 2) { row = replaceCellXml(row, "B" + targetRowNumber, "账号", false); - if (!guangzhouTemplate) { + if (!preserveTemplatePayee) { row = replaceCellXml(row, "C" + targetRowNumber, exportBankAccountNo(bill.getBankAccountNo()), false); } row = replaceCellXml(row, "P" + targetRowNumber, "本期未核销金额", false); @@ -449,7 +450,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { nvl(bill.getUnwrittenAmount()), generalNumberStyleIndex); } else { row = replaceCellXml(row, "B" + targetRowNumber, "开户行", false); - if (!guangzhouTemplate) { + if (!preserveTemplatePayee) { row = replaceCellXml(row, "C" + targetRowNumber, bill.getBankName(), false); } } diff --git a/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template_jy.xlsx b/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template_jy.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..8bc292222b718c5dade0ccbba90306c193bc05ec GIT binary patch literal 14953 zcma*OV_;p|_CB1(cGB2pW7}+O+qUh-c9X_-<21HyH8vanllI(uPW!v}zVH07vDV-- z#~f?#G3Stx00M>tcpJgeo4jxD{~8dl9}KMZW$dhN>}h3Q$&g!5k!gGXrW`reX@!Y%+3=_!0FpI zshwLOi4plMAA<=)m*Pt*(AL(AXiUYbu$~M5*;A4v#EG{k35hJ=6jT+An4ugVO^qd= zWGFsBlW+`jT=b!J6*Z9DPa6Mt-Vo0e5sdhmg^{Ux^Rh2D1*RkYSS5{;{Da28$Jj0t zTX&vzSHoH^;|ILrW~9&QyQSTH5Qv|`TiD@}Zp9oZI2A(a$OGm1^+n4qq~zxsulIiJ zPObDUIjVG;jHjt;)|VZtSzdTqg7*|xL7K4oRf@C9CHwRABW|40uBU$fW@&?ZsvO?8 z%e)rr@NC1@?sE63%`2+oT%Y0T8Tt|GceDo@VKw+)(N=v$8{wa5>s#9yzQG+BD=X3U z0Xc9DJ?)F*RA4<&0v8*6DOp?KwiP9_sTh6pllzoY2{t76PNsdk`w8*>MRxHz zR0Oqo20jJ?vJYw<)itv~MGr-bfUl#5gw_lOy#sJ~;@!0(1qO*3&{)1z$5%v)b+JYI z2?LW|jjj*%dSGEo{T#LLS?Xk$?+O++gTgoOwBL6QqYSU8fJ z0s7J*;|q99m5#xT%oG!R%Eazf7(k#)q{6rXJZ_Z<))yum9r_xxFGw z>t3--&ba~6=RyIJ1lmS9jWg1iNbLN}q-MqDY}wOi7UKQ~eXV2HFz+O;f+(&IUQlju zOuejxhV6|imCu|c=bS{0UuyiisZ>Akb2k;ef6}b{oGo4RLMZo91KFW>kGeUOw3`9% z)Lz>w=n?aGz`<6^?FC-}4|oL}={LX~?H#Nw-ypAx9gyz&0MC0W`Y5pNzDX>xMFByO z7QpJ0eHBL4XG%!ygv=2Ld4BpezFLECxi@tpjU`izCNp?-Aymv+JRiUvoR!~h#=$Pm zFIe%ow__q`Am~~=4EZP!^!>t}svSp>tYkjYVikCid?k~S27lq5611c{Gqq*D;#5b3 zr!;2aV*OT*f(K3jV>BKzAGdifsPkjDFQIiKL%R@j81B)PTODqhRia17tu#k+x!5-e zbW}t1oN;0lYK;h+6S*uJ4P-(=JGtqrYB!Kk7c!EL7>mkWZ4~pN#S}vxZc_$BMb+8q z+e^KTU|(G7&FEgT!V>mQ*HFJRga?R6ijV7JTT%SaVte<`y`u}m%iH#IEar4iXM|)# zG$fgt#Udtx6YcZBq-lQF9w#YP!4539n}w4g=w8<5{-?MAa8T@-A8$b4K>yFF2j~@a z7mJ@s=RXs`{vvR;wllXkF*J1eGeH%3gzk=m0s#18005xEX z?*7Dm5i?Ye1-hw8wsDFHk#*x6j8@bA)YhJa`rKwWENuOI&@Uz4(JC*C50_D+#1UTI z6#+yTF5sKxSDC2F5ClsA`bi8*5c%CWlo8<2jWw<>JO3myTPZ@bSdu4vXAELmmS z!znq0N1eGiVAF$V)O_>{;0O&dCLMqIF~ikU)NtD+^$Z*1>8mpJyxqjQuKa~3H}ZbB zSsJ-_gRY46v-Wq*F42je5!M;x(a8A^c6_roJ!hScW;Y=?CNFu{lU zEWG@3t+_fPPU?QTeIz&xPxHOhW14n3DK{)Xzyml4GAu6?@ZoKI-FE(Y1uu0PN7-aJxPq15^X2$aaYsYVsCjwp?9^hTJR;t@+W(9PVSB;HV9w|`qI(gV zR*fU^k!b@WvNKLs2_x&=0P>@aB-e_fTI1e2s%n;tBqv66v=C5VtzoMiB?*bSD>Vjq znya7wL6N2@v(z0}!`BfcgHOh2a?~2Sb@a-2HW7>kS477_=Z!uQj3rk@*M>?FV?XcEP**?g!l98Q@mnC~Mg==ysxZbR9H|j@{=^rK#^2QUq2!ki787 z$0AXT94}s93WJJtE16hJhGYZASE@WVFFB2J#x&o${heU%^3jba9m7L5uhedfFOU zxfZe-S-Tdh8rj$uL}phe7~-KrdQ9RGOkJQ{+HlQ*%lht*QUjOe!@>iXTJs%zt0no{ zcU8ktvAYHIX;fn~kC5Ps_Ld-}z9s5m1!GUi3&1RhL}|snA(FrYJ5l5W41zl$RPd?< z)rdrgV;C_oq#qK#Al;(IU=z4+1dq4|Zg(PG&1~~`smDHaJSCsurGJ9TBe|a>Ilc#o z!6(q?tN!vTNX)MvI);q^N-!~`6nNmIP1vAIj7z(ZDQ~u+lf=D#5u!5_Y96xXeRn|L ziN5tq?W6fx<;|ydjv4)PwiY}*&f*u;ca2$YpDPmv3TZ8LBt>Hq*bMNb7fH-R?9C$*WW=wFbr?r4Iqc}X`T@+Kt`sidPWYS~;iC zbWl{No;4|VN*#Wq+VGt6drxM;Lr3kh@Xf0;$(^sG#nqXqY_zS${k`Ga2tcs6V+$5B{_8{3$)_Qn#dukvOyBpPnl2QlxC)*p2U{#UaXTe7F` zfBzkG&J*u#{Q5JVnEt;$1?k_Of(dEb)|)D*-M^lK*i69v-o)sZc1XA4&66ffH4l>h zVlqHRz5$umJbmTr`7~dn^y;P^k`A%5vQF#d#hOpOo~kq)xGzSWv`SB!{Z~~R;wngb z9NOGkPoK{phLR4gjGHkl^0$Pl22Y#4ca}~n;Jja!R@&x0*4n<`mFr_GEj^qpSv9mB z-!{ZGc(ASBggLfV6V~X}V4WUSq|H4$wGQ-66`M5f!Htd5JPe(C%m@W9jTpNj*DQF% z2J2n44J&gnE^LRNkM69sjm)V#JTFC;XEgh&GIYN4@Ngf_q=mWMaHrSyP}BLH_wHoexP9&R=Frl*I!wMF z1ViKca%JklNtvq4h2?~MS&{N=DgVWWC1XjEDygkz!1#8>8``Q}E8X#!*YNI?bItnu zScct5J4(;(MF&s8?Mh9xYFj_)_nFg(<1Iq(!S~_Sah7Q>HTy$%QVX@(&NDoh(6lqs zca~ErJ2mGIdbbKx&n#Idt0&EKttFoyF&s_rK32V?j%lws)!UCXXKZ>lBv)K`f5*M+ zEIw^k{;o>e(PM1L`~}l<+>URil)8 z#u&G%*D6Od+hetFdJU$MqE%M##i8$`-4IL}MZ=gtqsGuig1Q&_&@n?|l$D#CT{Brh z*RAb9$qY@ya@R`!yz`M0uoFfuQMiH&PS}K((Y`|X(MU8{J+!JaWbit%So72Y7`{y zf(}WUxw6$kixd(23zf%%4Fyh<#gWj{ciJSp$*od{_+5-@A59GAY9wevRc^6X|s_Yypx*0(-IuE0b8mO z|LbzCO(Fo_*L~Ja(Bg!Qa!Sg127f#c0wRx_Zl@ndCWBz#QlC7UCp%REfj4ruE_Lu9Q0!fLzv6M4XEaI2Yd zgLjJb?cS+;%R~p>K*Ha^oNs`K)p2DdjtC1^acBJ)62?25IVL|#Y>_4;#HuL9M@{OI z9fEKXg3Wu*x4$8XuS8D9Ma`?)S+8nQl6|Hi4rzwo1tbJ4D?`Rj#+6P6olW-7`;0zn zf@i!jc*w|MaN=;JkU(UR;vb=85-TlHmng_MVX{#%IAshVK>|1ZC%Z!V@1#;z4*#G? zMC6nS0RJ}y^)|xq3KqL@3bDD}4)}lCrwbsY9G{7rO{Kd;Rj(-Hg27A8^6CIeQ;tmO z+8ENf4~{f)PEPh!Er21!l2KKeU*{Bn*}G04p*ETS>Ot%oF9PF#@t`1EfCoJxc*>oT zg2v?d6(0&fHFs_}wWL=MQQj#MLqH2iAdZG521oIte@u60RMMPXgA6VtBYSwYVBj5c zm|s||pW06i28XcdA30^*SY<;Lf5$+5E;axxEckU#$k@-GwP&%1&0f{_9* z`s_?~LI(4m)*0>=LN6HtngT3qUUf=O1DJ`u`Z_Kn(~ATb{|ZHrjDyg=>AOM1`Vl>K zkidd>(>Pf_;Y8y*&uY4|$@viQCs;oPjH4KGo-4gc81$xRU2OUt&;KtS|I?dvzsN@e z1sv(qiNg7^vr8Fm_g6r|d|so{|5sGxqnBD@|T~{WgL2c z*{PS{H#r3u{~Fgl^^lMsfeMKs;E?$Q`2K<%jZap_P0gqJ6{vY7z711=I-(6<0uwSa zWbeb*$m|3U`)}+mC~uG>AcN!;fRIVdGlyHEAZLQgsAIrQ!{Ty9WdERi3w**q13!_7 zQwA7DQ??h$TIh9M=>iM!{XP-DgB0;=UC9!>1pKvfehC11od@21HXr_<=I03VeI_d; z6VqY6jgxg{Z57GYYv>${lRYlt%O%LJ+r7-L66AgTRQx47ktiL7OJqD6lzmjA(P;8QF2$cW12=gh_Wtnb4}<=T*g(Daqj&7$V{gmqb+VC(Az#%C zz2-16muzqhNXQC7zj!_?LMFr3YVyo?AoE~Ls3sdY zD%Npo0gOt@NxIvqbJO%%N6%7+kU^5_Vg0IyvoCMnBuC0%<2FDr~|8eE^erZoebEqpaW%8rTJ zFWljcCbBr`1dHH&w;>tV=RoM7$Pf^?7`k7)H%6Zmuxpc`WE=TrV-F9sX_BBK@(sC2 zv!KJoC=<-`oMiUq04U~cGu#Shi%{+v0bqjH^Q(F$8r3UmQ`u$#Q$(UpMy(o`9nTV< zCCr(fherGhkJg#`_bN&^4rh#-H#eF3*GtTQNXSx}DPcWf7@XBHc@(IbDssST`Rj>K z?qjfr4c19BiM)@d%MI3YX_Y^~skQ%s2x382n3s=Mqu>^rnEeppyivk0OC*NT?;6x+ z0$yv0FAkaxEMkBt!34J0)qigl6r^V|v@xoBMe=>OJ#w(kajLUBTERFIi5W z5N(^w#bFI8ZQJ8^gEg-EIv5s=g-aHZ3NXu=s!cfYdKzqmIUCN|T-;t?2rD8P=nBpZ zHabTKroEu&R}v?G=U{=Cvv(CECmi)Rdfai{442oewmy9k6C_)!02<2nst6}zlcC;r z+%>ih@a)$kEBr-qi=$NjU2)SoS(@OO#I}jfUZAD(cQQ>N5PYp_Zjr3=;)&_ z6Y?P;Sc~2ptizj%Rv=5~ycfe&$uIMqK0ILAm8i~pf; zBg=p6gNu*;5OFkeH{RoDq<%k>7iT8ZYl1XBwPGQ(J z@quQr*WBl>hBg7~;_u#Vw6yAU4yJYJj7yfSchZmUr*xldNq3QPAzGhMEAJzkJ`@IA z@gcnjtD*`LQS8lL`6k6mVL(DK$B4k!3ycNV^{IFoj9tPivTw&lwOBdVgwB^cwll!3 zDU`d2Mj>%H)IL{BKPUE`1eCuHA$-TpXN1Ho~0*PflExhs980pkJ@Eeh(E5h$XfX( z(ZHR%LN4U@)8b@@0(I!M#?Lk*rn~ya@FJ(F} zARVB$pNDEU1|5a-K4A0u-@E|-{%7A6OTR|SSK zXwgeP7l$?*ye|qGl&^8HNR;oDoM2cx`{cpF_RSx**uk05pz89bXKwR2-b7Q2OGI?H1yaNpsElJ&{ zIyzH4%d`)2r30EDv-a~wZulmeX61jLS6$W0J$k67O9;)88U-fvc(xC9Frc5t>EQT< zl05g;Jp-`0@;jOuj2hJ={eWr#SbjP4^(dO+$1*gGK{rD4a2jl*{IQYyJeX$jEvqRE zrbVvG9451!2jSx`52Y@hfUiXGx!nNHQF0hOL}yjFX&@ zXp+K7Oj2*)-L3BN`8XuH5>A&6a`V{H#s-B`Bbu*g_DbA^2hrQmb?T1eTQvYeddhf4 z`&!x-JC%dudUku-2Z%U(>yFcvN&>5yeJfe(P637sh<~iFcfLSFK8FqS{2r2E>tD!j zUPH3zbteYy?_C%@YiskjXv|Z5{XfqO-$r;2YcykCZJQe3EAAJYkD9Ppd_XH2Q+(|v zS7COVx*|0NiEq0#NNKYb)(v92ZduF?TH}-s8dePO{&du3CoRLet*)82yk@!?&@v#F zYjX~>8)!h0YFj8O9V@s_Y7>3PU|5d$vxrqk^!ulRk4+4Dw1jyyT)@%!B8cXfK5|`1 z{mDfoSVV0pWEphf`EA)Ga~*nd0P|FNBf|RrMv|g(1i)@6&`c@du!KDY=%VU=CZZ`l zTWNyZ`TXIzIpcu#pt7EcY3xbJ8d_5Ym(di2TjA>>sr|`q={rp2)mY)e1SmK8tf1%g zI7b?yd8+XQvU6U|{JqCOdy+O~5vlX+{1eq>V9<9k2M@$zPbY$3Y}8-}^=#`0y zwFV94l@1IYQRu1I`Kdr`+Lbf?nG2PmOe_ z)m0N7N5BliXiPI$!)PmPu(-|`tRa*lPcETOH#Yg+e4Ja6RAImgQt=OK0|(A4Osps$ z7;cBzr_vzMOBPZ>Ed7*A{KH7?*CgQIhaSgB?bL z8H157bXI`^vbd4nV0YSG9VfvxoVKrd-nYcBJID|tV`M94ppo$NA6*3~CY8D#UmhwL zU0=$u#zZ6=A~38Q^s2fkWPou<2x9p^1VwwfE*qQs*C|yxRnHzw6000J4Rpqabivi` zqRyqRonwwf9zv8KmsjZsSTYnnssdmm(1b>9v<&Lo0vCa zx2X@W;Y&ZC?^sR}U?ykeET`*0aoCL6oM^I==IKk%(?UYQij*g~-st;^{1}kZ?O8u_ z=;#@H4V;Bw!KA$C7r*7t-IC zh{jA371iqz3btqf0GPkBwu7sM;m>rvqIqn+)QkSYt@Glat=GjaIonLdRxht!9|YJV z!?^Gvn;K9p$3ic@Fh=3Pfh@XgWYTdjC}*kK5oETmzZ%ZG$*~KgR_uOEq4>%4r8Bd6 zYsh{ZTWld;kmMa=Y}4-3?J{PRb6QfAh}%Y!nOZ8{DuvP3O{`^hU*I|!rIF|s9LaP>oN?v7ClT0GK4;6(otj%5-6((Vl1s6%y-iyT-`@* zVCkEZwKh->Y@@?oQtzq1E$r}eb*fafPzVPxa+pK&!I*@By2ZO2i;5-&}WHBra zHdCUE?g~aOqn}6MuJO2D4eV!GXLy~%p37(hNJh5qe!5bbQ&Wg56lAZNWi%(ScaWXM z`cWt^BS$kx)!EDkpbczJ%O@HOjA$VHoQ`V}==9EOFI}E|E-M}`sp*S2xFTfu;!(A+ z;tShR#%3zEVImSMkxX;a+a^HbtU_J0xppO!4E6(>>ApS~HbFB+# zCY$qd$5P4Y)r$7Z{#j6?*E5(%Xx)*zh~YLgNQ3i}!TEN%YPp}}=mCeu>)uUlR))Jj z)`GdNb58XFU8@9!=Ae3N2se?;P==ySFX??~0p}}>S~*7K$v257Em=Aqr#VG5m~lIE zW^+1b99a9_e^7tpzVh_?e%*996j#^2B!(F*Jp+amS1(NBNojtVAzh$pS+{g7ovWp( zX6Js9hSx4{?X1QmlN-w%)Oj<<_vlu$V5P)SC(Lxb?66HcFuW7i6|r4GG%Wfo-YMB^ zOg?)Bo2sMdowxAst1X#!`r85Ms{^HsKdFA+aA=}8lypSgnd$FSOlvOIG>Z9 zUt(yXYBY>!aUS$o%S~n6ogTwJo}c@5y>h&{Eg~Dig*(SVZq45%pd+CqhS%4|fp9rG zathHTbTUc^?O7^)*-8en|Gc#-1R%*acG15GR|5a6HvS=JJp$##9lzcr)vbJ7k-s^E zyln;JPC^*Cs*FFGptnxfj}SIn^4$;NccWyqU0oiQMUKouN;uM?giEWC2UyC7v+STJT-STK5ASg@+_6OcaS zp+W1-S}2iT$Raq)O%s?#%p|WVhL!Ur}#9Aq@PgJl8HeKl%3FU_YIYT>$({Je#v!9GvmeRt? zu_Hwe&}JQr^UJOWipRN^i%H4~qk`Yn!!*&eMq2ZwNM2!bMSskz;gI>(zLY0`_~O+! z)8&2DVmfcOmQOhw>IzjN{vLgoU$Lo@<$Y?k;pv@BLiv}mz+y60T^pJqr9?%Z`<0JrY#aF3J$IZzK=+mi}AQ2ydu;gp!AC02S*XoLrGf3h^GC5 z)c^=7vjX|`(>R+UZ|rFqR#``ZDCM}VquS@*%sI1!w&L7b1iw%Z5ccw6Wk*$a6%cH~ z+5^7nr%c%$Qv3|y7%{XEKTQQ-u^PZ}ukV}*%@ z5bs=!6vU=YqPbmQYlq8eWjjiukI=7)XA!Hpa@F)S>{?SKXA)H;&dh~9LkVFqc6o=6 z>Z4dU7cB8&5)ER>9uO)F8;cPxYUSC8wn=RpH5z84;w^%oAGJvRS zmTuNVj9)3$Vj(^qiKI)~Y`;n3dXwaiSFsY>4?u;~x=FJ&_hLcUaX0r4IWpK-6Mp?D zvq!5&ykJi!m|4Wn1OvK%ZyQbh!}`iZD95eUT#C2d>4czGf;yIsLGohBSte|mf#}zI z{1|e87p!E!emiAvpH9RU5NNiVTiqF$hO2-}!c@!cby!;iFAH8If@BQGEf1qI8|Dmb zB&pc)QFaVQQgUXHOryEjo}5@*`EeqP)m#DzMOtNg9F)lcuM0bfestXg1=#UX%1 z0eKnYD2WG;WI(m16hGnoi6Ftc0P?G#=&%bKb37oW0s;qu(X}DAtoKkA$%EU)ZqVjh z3&oq`o2uJ#cKcK!A(8iY4g|Q^f<=5<>X6qyR+!q2LV->Yp7z`9MWZsZyVAyctp-ZQ zdrsh0?-Z?196%q5=GeZc$K9c*`E9e)u$Ardfi^4& zp$58@a$0R^Ip0NA`>zZ1g~3HmYWFc}BThK0Vc{hhzeb8uy*n}J$(PfWG1R656| z#yT`Xqs3HWp_M*4NUfR-oXWYIzu0jCSfbFqfiq$2kW+!F{|fGQ-_D4)kT8k(3F*5z z_;vX1A)=ixCVup48X4w=E~Gfr1-=x$L^W_p1SUL-1l6Uh)`48gb7PT&A*ewaOgLZuJ%gygoDw6k|A?^ksJ-DI{!3CTu5fgOV74Bz(UH?U#dzr5YA**Zb8| z4f?`vcyx}Fo)yBL82gJX_Zl!BXNdmnnIr+{8`#0S`;Sq4{f|f=!O>ao7#-3M@J68b zZ}h$!Dq}>n!4t3Cv5F2%3owpv@H0AKuE39YTW7RAxICvdmt*Y}5Mnq5$aKKejB#@{ zzI@-$c+hUY?G=m0X(|ZG#O6WC&U$$`EofM?0|BH!ct;e6r$vhUVtF&Fe#x_(+5Q5T z1S=E1zc*B!?RW`imF4wAB*~A6f&`)IWqVa5d--vPOAF&E9a=~_1dgP9ohjJB2_6br zcm&@s$HFMl%i_C)->Do3tZfK@G%NxfoXOg@pv*M>=J_{fW4NZX?epdubsY9$PR@0E zXkRRTy9fJ^kWt`2nE3_mUMjTL+P7lPl6~M%fQc@ntVUn#oNsPUjT^MGywApSzuU?p zfrjyM3re)poNH<$?OZ)-H|(;s+w@F)nI@* z=GOh?+Ta#2_(pkJ=dZ?Dg40o6hm8e^SP6t^6e)W!uj5+8zsUvY#;O3I9OeyCeY?tO zq)W-e7yXl`-x4zBFCO`j@VN;G@5cZ)mNa6eEBExh}B@ zql~uuF@}MS%B~}q|G;7lpUj^g7nE` zq_rC{{gcd1%J@j)KoOXYFJAJ%v~yRlhAr%+rZx%CH5>jB2tmSuO(=IvJ`yObSpxy0 z^#Fooxob|-;x*g0H6wWIB135F7aO7v3@LG}Hz~>=np!)lfn6PAv#n9gDiY(4syZ&G z;T4}l(=tS9Vq`q!uri3O$2N&$nZ|D$Q08qjtz=I|p1b<3vtbj8thBGamMQM%#?p%O z7O%}YJgXmAp;P<|3(XLv>^B@G~5K^$j;hY*(TGcwjM{${k# zWA1e0q<*Z{Fm2(0k=OgY>SbD>XqrTkU}fCCP;$jycW?e7^Ze8DoMMxIlhhcF*Z2N$ zMGEW)9Uvig-h>1mIh4Kp7M+$&l!7ijRof*W+B92JcGRQ<9J72wXBba*4ELk`J#FD^ z%Fh=LlYB~ zER)n)SG9^J${NHuR;=o#7uJeyZitx6$E%?{5-H%g}S-X-)SATL z<{$X)#seufaJo9=6D015gmEi+60kEV+!XciO_cOzclt-QW!C8E0X@@7O2L@LJgr=h zu6k7{nJGIhck&pcdIR{TUuTW5e=6>K_zn-4DZ9s>M# zIO7*-h+;H7oQ0YG^xljjTyr#KpZHFqy1*^0&Tw-(emTD2k!T(*SA|jXsg!-i-gy`inmQ|bpdND2SY0d zZ3R~wLwn7iC-dWntUBL7O1OuMX;9SDkyS+T6~Y~QJ%b z4wo!b*OQ(=cP}z3o2Ub9H0qz1(g{LH0MixWj=!r1>M?$}V!v+zj5(!ZUO91w4p~*G zcTt_QhDrL4!eC&^NOxo~<*aQ|PS9>JNeNqKk{UmE&V2E{RG)#GVI`D2x+~=d(L4>q&vRdFt6|^us|0Y8aifbYWe6t_d9!Utz zPl*2P%KDo-;We`Vt@K|#T7R9>BFU*pYbci^Ad=YKK$ zjuJA%Kho8ohW?q?-t_!JiQ}Ja|0m1+Dd*4q$-m_^WB%ve%0DIiSu6irf-U|p3IDE~ z|Nr;h9OWnLzmDGg9wC1ozWG~Y>_6H5K8o|F$$##E{VhNm=cnF(!uG$6ertI8HQr`8 z{nrft*8cRn<$pFnz488 Date: Thu, 19 Nov 2026 23:24:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20=E6=9B=B4=E6=96=B0=E5=BA=94?= =?UTF-8?q?=E6=94=B6=E8=B4=A6=E5=8D=95=E6=A8=A1=E6=9D=BF=E5=B9=B6=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=A8=A1=E6=9D=BF=E6=A0=B7=E5=BC=8F=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../export/ArBillWorkbookWriterTest.java | 11 +++++++++++ .../export/DefaultArBillWorkbookWriter.java | 5 ++--- .../receivable/ar_bill_template.xlsx | Bin 209944 -> 212304 bytes .../receivable/ar_bill_template_gz.xlsx | Bin 540311 -> 540126 bytes 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java b/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java index ee1866f3..6f933fc1 100644 --- a/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java @@ -187,12 +187,23 @@ class ArBillWorkbookWriterTest { assertEquals(1, workbook.getAllPictures().size()); XSSFSheet sheet = workbook.getSheetAt(0); assertEquals(21, sheet.getRow(4).getLastCellNum()); + assertEquals(original.getSheetAt(0).getRow(5).getCell(18).getCellStyle().getBorderBottom(), + sheet.getRow(4).getCell(18).getCellStyle().getBorderBottom()); + assertEquals(original.getSheetAt(0).getRow(5).getCell(18).getCellStyle().getFont().getFontHeight(), + sheet.getRow(4).getCell(18).getCellStyle().getFont().getFontHeight()); assertEquals(1, sheet.getRow(4).getCell(18).getNumericCellValue()); assertEquals("备注 & <快照>", sheet.getRow(4).getCell(19).getStringCellValue()); assertEquals(0, sheet.getRow(5).getPhysicalNumberOfCells()); assertEquals("银行信息", sheet.getRow(6).getCell(1).getStringCellValue()); assertEquals("收款账户快照", sheet.getRow(7).getCell(2).getStringCellValue()); } + try (InputStream input = getClass().getResourceAsStream("/" + template.getStorageKey()); + XSSFWorkbook original = new XSSFWorkbook(input)) { + if (original.getNumberOfSheets() > 1) { + assertArrayEquals(zipPart(getClass().getResourceAsStream("/" + template.getStorageKey()), "xl/worksheets/sheet2.xml"), + zipPart(Files.newInputStream(target), "xl/worksheets/sheet2.xml")); + } + } } @Test diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java b/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java index c0222299..df29fd04 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java @@ -49,7 +49,6 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { private static final double MIN_TRACKING_NO_COLUMN_WIDTH = MIN_CUSTOMER_ORDER_NO_COLUMN_WIDTH; private static final double MIN_FORMULA_COLUMN_WIDTH = 17.0; private static final double MIN_FEE_TYPE_COLUMN_WIDTH = 10.0; - private static final int TEMPLATE_DETAIL_STYLE_INDEX = 31; private static final String TEMPLATE_SHEET_XML = "xl/worksheets/sheet1.xml"; private static final String TEMPLATE_SHEET_RELATIONSHIPS_XML = "xl/worksheets/_rels/sheet1.xml.rels"; private static final String TEMPLATE_STYLES_XML = "xl/styles.xml"; @@ -81,8 +80,8 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { StylesTable styles = readExportStyles(template); boolean preserveTemplatePayee = ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE.equals(template.getTemplateCode()) || ArBillWorkbookWriters.JIYUN_TEMPLATE_CODE.equals(template.getTemplateCode()); - // 固定收款信息的模板使用自身合计单元格样式,不依赖默认模板的样式编号。 - int detailStyleIndex = preserveTemplatePayee ? readTemplateDetailStyleIndex(template) : TEMPLATE_DETAIL_STYLE_INDEX; + // 所有模板都从实际单元格读取样式,兼容新增 Sheet 或重新保存后变化的样式编号。 + int detailStyleIndex = readTemplateDetailStyleIndex(template); if (detailStyleIndex >= styles.getNumCellStyles()) { throw new IOException("应收账单导出模板明细样式不存在: " + detailStyleIndex); } diff --git a/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template.xlsx b/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template.xlsx index df730b35a7c694966a20d4eca300d0aca4b3eee6..f57b0a15cdd0861618afeee58beed3b36d784308 100644 GIT binary patch delta 11602 zcma)iWmsHYvUNk_?!n#N0|a+>5AN=6jk{apfe;812pS-`I|PT|7Tn!Gl6Pj_J9Fo` z&)0wY^xkV%?OLnO>F(Nh- z!l%d+WStD~h*IJl62$Y1WYUQHx2)>s7O0b?3e=Jakl8YWXvEsu`YbA6i#%!svn($&TjDNv$zpsh;0* za@A~H^cQ9#cjO#tXEV^T>J2I-cUw983blKi*9llYkd`%L7Ub-F=@Eg)h>L0ALj~W+ zxY6^gN3qd`sfn6OSK2A4%{5)^-tJ5-_b<9@cUk?&R@c%0R&k_je;!~D*IQPNV8s($ zCCj6l5h65zv3|<3mQ~Pc?}T%r71O`Ny_)Ry?8Mvdbr;tbkkD~v%JKA!^oXb|2ZX`` z003}+2*nNI7|qxP(Ue>WMo`gI*f(IB0594X+P1JQ2L^6y8TRHU-zkq-6lfCH@upRQ zn`Aq8b@x;FKFzo>^f)*K;TTCxA8;Yqg=pnt2VW)CR{~^Sz95P6jeB}bCd{}XnyES? zJ!tMzO8ZPJ*E-KibKLjUu)X$ML_cE|`)H3Jrw*Nldtp~0;^B3Sph59+$2`YD#_!N4 z@aTF&?NEz}0jfqNB0(NFQ;{1aUx9^(ACN=XUCV}Yb=#+Sk8_xMX%&wPE2vH9+*QCx zY<>aJtK13W-DSo_5AWfHC8(h>VH$1a(fjFS*!jyZ=gOPh2|&B{(C5eM)3AB#tLEc) zCJC&GL8x7Q^Q%L)E>bVbl`7~dUg#M3lXaAAa_O;&Hv#(+AQC&ql8eKa$Z1S4l>%O? zu`?e<05F>DX4{gs4e;+=!Y)_3il-n0NkM~(-K=QBC(@5%TfQ4qa+~z<F6>JxPT_x?jhQ;=7DWnNB%89CN&n zKd7*o^kSWkRX;H6VNr;?s7_zj_&|?&(NcFL*;N%9V%rY?%rqAgwB|6^(3zdSxiDFe z2qIzHNbI96Dd+3*jtV|Se}I3aS6UO7*-Q|9mf5|3?i*VeS=w@)duz+~bV@->$xNN6 zUnXTGKG8l8MUx$T<#(J}9pU!&W}{>h8ZW@nHspi^fQrbMr*sXIh+i8C^#u~XF$p_& z90mY*pCSOu3S#ZkN<5l?TD?IZ7sOnOpK$Vm=pTH%uMp&k8PuJiRqY^|nQ?b>pHjFv z$lj6tN*SBeaWa^tnnJa)*g0`#=ySeqeOW{yr($;}HH_>xnX)QF2|9YYle)nP75d0Q zRt<&!SVHq*^VX!q#_U6srG%^#nIJzebb)2>DTkj*AxKX83x(}glTE9pZE4>2E&H5N z=*=#iB27PaNJpDbPeN02VxuO~wUp%!2G!4%c+b6e;j_qo3WtN4JZnm-{<^@09bOMy z@lHC;!w$73>-k~WtAe%9mJ|}$o#$Up`>)QSu?#z!Ec@LzJbyWupha;AG%PAK>67l^J-@i3fsRJK=}RXyNOq$2s{(vz5?MZUl%Mk+6*y3`sJnsG=gVXbw4N-z zvln@dJ@JF+ebJ0hNRW<>@0nv`P>^yiccQ76w-e)2c1UkU(i94GkdYd-1(Q~8-kg@w zyfvdkVMcU`R@e|NbhOv0Ih^;VB0xJB92Y?D0p?W-f{zPNOo{Pbcz&BO}Kzu$ZHTC zFgIFqI)y4ke5-(OraM7{u2uzu$(F6v2XW;#ba9d#54Nh7tJY@q-x(Je{XeRu=c{A# zn}f2}=sB&wPd>&{>stleek?7nb6pX6lc}&obBz2caRD&*$y}`T4KSttae%-n+xj=8 zuuj+K9#((pb14;Pr%$+I*}K?ob@!P_Fc-`{;l1CNgX zfLtk(5X!oSj?g8GIvuC?D`t83Kodi?9x_u7XSFU}wP;O~} z9XW^iuSiBT9r7Acv$z46Bqs8A;@6SF{r$%Pw zGPlX|lbDgem`zE-mVttG(&Vih zN6O7)$qdv7Q%zdFB-25AQ<DO-%SBLJQ- zc97lFW9hvsl~tk}i=fYB9J2|4__P>d$P(!O!%gWZLoY6G)R97@CetQ%Ks?dzK7*WH z%q)HYGKq?uL4@6RHqwqKC=*1P+0YPqh_-+zU^m3jgVVPnRUPJW({r6vJ|V(SfL#>L zs+QSv4nZ#VnbPcarSA@zqwe>+#`;A$m z`FNGmY6RptomJ~TLydj(bX&mLd#(P%fHQ~Zl1?S_?j4?TLgSSRgnw{>ONei0E zZ$a+BZz9?O9|@|=JN+sMs?<6jtIazgBkzjMJ6wXA7PyVNdi|!jJv5dMah1=o&xwHh zK-Y`TKw}s^1tN?7w&#fgLs~}g2e#hRK{DRp@Cs-0yRDhappXv~VQPa!7r!dBf)7~?R!LSrp9uKXbRaIe+(pfKo zYMy118?c9m*GQ|DaCWA)2yh>QNfiSEr5+a|MQ-T?bEFH_34L971YANU$3>rB{^Q33 z!EiuuH7o!SNS`7Iiw9z7_OiE2%d&U;DUB7@{PSe*A9|Tzlc@I?kFlA4X#Rt+peSgsz)c-Y0J_Ub4nWJ{eETp_IF| z3hRmQ{PA0Vge*X?4R}WIMq!z+P1?Yqk0K43l$TLF^Jyq62jdo z2b+=XJY8lGZVgb6UOST+*6xS|j3j&MV;^~joH==M%=a&fg`ywV%JoUV%|4>nDK4M$ zccEpKPCwiby&pIH)}K@Oq;1H#!WW~|H58y8BS&c6N1)L9e7&fV{%fyz_v_>npyDpo zGo+bg>}iOg#Iy!TagF4gd~p6eTBtTC$Yf2|?_H`MRm)H1id=?rq&G?cM;++RnB7a48f&JZD2vaB8U(cC^a04w$R`@3Xf zeee&2E}3mx^1Fy&6u8>zN=@1BZ)~xTJ$5vEQz3iiTB_M^rsAry`YYwEdriS(r0knt zL6P24jl~2`y8U`J6Tb+q)}rdYbrwcwe6ei3U9{yRXc7m<-gp6rc(Dr;svUZPU?x6Y zW8X?5UY6l}Zgl(;mk?3!$(cqgAK9z%|L;Rn$O5~y!7*G z4UlMN@k{)5a5!~NGwEn$zAE+3#CsV+cE7Y@_9BW#rizzbyK!J*8&*7$E(jFB473d_ zbDU7MAZy*MVzQFry~JXMTQHB@Ec)?E!rV=Q%gyoj;{MnpPphsTNPDQqP1Tu_cWyy- z0NO!0t>KD;9*%wfK~6+Y3|d5GV&WrYWa^!5SG31XgT;-@Ws5JI#Z4XOvY7Jnl(YBE z7b{Pe_WIZ+7En~~r~p*0uWr^cS;_HUV~ejk=yoo|PN49?#Wc?ywev79z1SD7%$JY( zBoF(jiDZz)u<+^p)cd901d=l^JYN$_bh9a^fbNWx@+Tu4<%jQdaryITmppK^_`!Jq zxO6WxjCdTV8Z|NDYO-BtG-XaG0SGk4SM(zzoLOObpo!RzP11ZTI3Gw-?F|v>OC23p9LhJ`7pc4aCbYnbNn9l}|`U|v3LP+38vR(K9VvE zYywdU+pC0JbN!nAz8jp$ruIm7kw|Ouh zHL=7un+QMt))zW1ErXPDMs_+Hx!@yql)jerKUMoz1e(Fb4H$oG{I9M4TS6oU<3Ne3 zim`Gt!TAtEVIhks0ifjg;TD$u3=4y*zrz2|aTyUrNU~Bg-0WG||BJSN=GA}knR@#| zB$)JHm{8sjlRtV5`QIW2{Uc=Ny}(2)PEC{OM0Exg2JX;kO-hfyG!~YD4gHi49h5kY z7OP-Owd>6ASB?cGqrm-Zw>VJ$%t%NoBDDV&vn(I!f72L5``ht9Q>Ehn#|-5^f}Yg< zo9I+GVd;P9@~Qr>%=%3ctqPh~7mAY3QOaSH4+hIg#pGOw_?a~EXB+jKI+8qL8x)Cw zZkPUB-aCP@yoQLD203n3zQffa=!|upcYbt}rdK($4RwkA2;~VZ=T?^FsAk9yCM%z; zJ6XEoOqJ4T4Pi%X3ol+E5{YZ&QG{VY?7u$z5QGE(o}mDM-=!BXI~G?fV;6HXH8&S) z2TRxA-}V0L3JH_SSj*YBBw5FLJQ8u?^0Jm}QOxpsdtK&0?8rI^-Pq%f5hO9mPgKz?^h(MZh&gAKAs#w zS;;1Lxll4oh+W3)B%Hul%c^+Ob$kPXs(b6zD3_l5yd9i8o^Jp=FqFZ~lu##3)<|@@x7WjK zOcRVMD2g|&Gx~x$lgYw(4@h5-+-Bq*tt7Yx13$fxLsS{X!KPb(CjlY(o-e?{L=0Fp zHbLgBAM6snpxoG@IB73Iy?k*9Nn%@u*}RyP^!C;J7B?h`J2rriYJB@#3m%!GA@<$f z=wK$|eG)pr;XzbNFy$06Ndn6xEeWvNSD4=Pl{kxH0kzzXoYK5 z$^w^Zzf{LXr+2O8T(-C%rZ{{4dO4p}`f|R!tZD!cMg{c3ZPwX86OK<2zT#Nf0U-2?5sW?v=R5DM;;-8#!QHD&t+s4_osHhBvVwdB?!WyM!C)7C_J=e%CIY|^Hq8;BI z#8DSK^&X;d;(Hy6*oeqk7|Y4Tw2aZ5x5r}5zmMvQ@{TyQpy$k2CIqoPF$?0MYMY^C zD72I+`kGk|{o){j#4VC&UL1UxOeT;t+%7%sdcjz+tjlmVSKzxBLvpBd&21I zwsU=b?dt5hybKNMiJ}0@G9I#&TB*EU{)HxyIAjqoVi6CbVG$2<^$B#x;(vGbdXGHE z0szSWcs{#%+nN7)FfZ#LBoJs}zr^>v7&SqvgwExi`PMe?ReHwJYn0ePirSQ0*(G>N z#R^zh9p_9+ z#(T)SImvkdWgNVFuazL>vtDeYo5i-mEK87PB0_W%7sM^N#Qc2f(=bhs!}uN#6>Ax{ ze6ja^nMTX^i%~~AoogojR*z3*9uV5G6-OIM_DbBt=H;MI@mRLq86~E-7FHP)z2WaK zs_YcxHSn}Utv-RbWs6jZ>3%j2@Yu!Q%Vfl2UC>O)fJz->siP~dIQ45CRSbH&O4{!( z*XLQ&@=(f%v+cngdNA4vb#2z#eLq$Jn&zfF)Au&QVx=nFGuilOip`C+TzT=|DHiE3 zeAfqTquN;rco7 zll&#HX4;qerlTP~w_uf}Fm~GR^rt%Qdt~L6i zG)kB-dGdX@Lk2X#Ii8ce5FP_XT75?D2QeV^?#G zbSu)V0d=CC_CToloohh8Ic!>@d1h09m7y|SJSzB!@&>p7GT_n)Y71Xg0gxu}-}i`UKtlRqh)TWZH~FJ))SR6Z4QQo9Y-Qw^>#SjJOe(Kn@hN zhiCRf5JpCE*e7t)5<3oh`;1P*bRs{QCOJ|_)OWWg;~2ErV`2NYX~syb*^fR_DujkGtleckb^i z;N`jctERS32|Z3DKg5&zj#>Wn$|o+b%9+Y10Vh?; zT*;F6(e;>db{To$1-FPOHZ1O;2^E8^QfbPktfvYt5X=VkZ=3O(Jr1@`Y|Py8VVB1` zZOkCpv&vK4tL795A{6&Rw#D94$knFBSu`&@$i!)u&s1s@rBOA|w4v zv0>G#*KKflV^-#6d~EU;0`e5y{XM*(kJ@K+RahlO>y3CFF)WnUS&T&RaMLNBUQ}w z%dV4-g`St}{7(o_Gtak}YxKh|r#ZK@QhS~R-{H{KZh>!1GeKo&i&)cc^|AKDu{uFa zE2$r5yImwl@JfO9e9?#~h^+_1aQHzx6uLB50+CX1dd>LoSa6bWyO8&In1a%2pR_~Q zS9=DJV5ou!R|$sUobYH$iRGWP5rRI8HL)O$X|K1vG083lmG0o{Q`If%Y%Hb>8nRPF z9$^P#u~i~t^ziaXS2Gf3WUm`a?q;YcCG3w7`)yvjuf(b@;WXzjA zoUAv!hC$3ZoS~8AI&kPBU1;Rd!&MWY;>>AD@uU$+@x&jJ;?-Z`fTjq|I<3#EQIsZ; z_i%5ot2sqL?@VQ&()%VU>#<#8Y_O7(O?a1??eGc`GR8B(l?{#Z>*oS17M0$qO=G77 zk{A9Ob6=B;ZxSL_659-d03@gr4uUk1~o{1rhI;?ERT4Zs4X@w z_s>3Np!vmALBEWUgQ&50y{Kn3#Qk|kOym2iz?-s<0gN?gsCTIc~a ziI!{6%Lp}yA-CQtDej8+wmWp< zMAJ4DBT1hh&`U8Wqgg}qNkY9duTZuex2@MSEO;hd3ipHNs~pvusd`q1B%-L>7oC1e zQu%)NCEPvGOdX6(q>=!udp8lsOy|3&G%p>P3!<~dzH$!ii=~g^(m^#)7<-Rl3m=uL!o72QY zf?+L_&cU7~00%aMrhwJ8XgKLaA9q*{c?GP7yaL)_ZQ%n(t*+N1Enlbpng{&`)KSX8 zF7#9B@DBu~FC6(g_0%rj2wyqBA%A0(xr^?JC-iKY4e>)TPyU1VKbo(Ow)<1nrRaygk0&Fis8;bE6QGS`+AeTRo}Y%gtw z&>`el95^J}6U2~7$5pZc3Z9Xfo3TZaBk~b-)Mp*TI#Xw-NOuCn#K{K8iyY+Z$y@-^ zNz{}{lI7H-Pc|wGcKEb99xBPK)JJ-u9Bx$!HA+->SrVhybA2q-DK)0O0pFQfa17Yf z2Hmf4J)mp+!9ho114UcxNo{+QINv1;@L4}$nuv(+*!9~Y1Az30JmNP$3VMrBeh=~l32HS zjZ|OUn+7{VfXVbD=-dUCP=-{hxOYtb@K~iUut(<{&DcH({ z3ViZYHCz~1eok9>;Ol6irdF3`$SjX>)K~8k&d@y)!YT7oD;ic(*2LlD=cse8!29is zE0=d_#>`F}p;g<9ei^~a5&?+o@#brrks|KtMrqE#&|48cP{bWSOFgIj%hL2DE3igW zZf^y7z9MMMX-&!L^x6Y!0Fm%pOl<_J5=l#VdX$fvLPYo3yajTHdEnZpR=eNjufr?D zyw;0%V5DeVa#P1{r-VeOt(@nb&cpR_eMoletL+~l32(Oju0HpZnms4cgv#gm;rm3N zkdGqmUHffIfVA+D^3bRRa6OWeOCzj|M&hh?=?WpTURHR0AI=`%-stnPwuo~cA~PU5 zWcZ(-?G3)MyisiP*{PqB@B!d`{A@|aJe2eDaAN7X>I5x%PXQ@SEz+VW^tgCf@%9&} z@g3-fgqbKGXKI4R975(~S-|%tff-sxU7peFdtV8teRa!PxEyURGmIva$L;G4t|p+*jOm^%Q|vfoLw0nV?>M?=q@1|iqpiQLmj@yODJCn*D8VvI4w2}pR4jrtvi za7OX&g(E}1yHl}*(Eeb?p02|SC8d`;dLzH<_14;(Re`6OenGo+B2--Y8rG=op$3E^ zQAz@0hN@d z!=Mh&o*mv_z_35Sa484<$fY~q4K-A4fETakp$3)b#M1e7o&$3tTH zy_YgFU00TBD5-w1KlLS}t_v-{9x0p!`_*z4o0eXO-yC>Q*k1(BH%PjOu<{2@!Cq)k z$bCg*&wFR66x+NK&1S)f$2gb*ErFDIIeaNdjuhS~(+}Rzg%1o%Vu?~T@O>c7pl2Jd zL1ILHC1jN|rKKZrm#EPFx!wtx^J{(savh*4=zS2dX%BvEWnXCI5oTXGbN|}?WccVK z=;=$TZkc{-^&(9KN4MLQ_0t!RsVchi*O^h>VFO#nNu9Ff&4 zKi7erRCuN8o)J_w?IgU7_5+1RknxafpPYd!9}|kL1Hoyx(o)t~Z?`Tg*Hq2Ba6zIt zfor#G63Kjqpli1YvM&PIfPKAM1^bUa?7LsslEdlhh5KaFlpS^P|&gwo3bBH zyo1sRMm-8=tkdw9j{{0)OSxs6bK})*NDgI}{Yz)cJUt2_36QYfuiwmU2cbn`F?Nbs z;?DB-q^M5bGJj`hA5ovLw`M6ZHLGK)cZ`J<{eByXnJVww6Z7--hZq8XUX&98Ca$Oq zjfwGb4sC>umfBS(hpZB4hDnK7zciBSKIx;9#)n8|5&M!Sxe zu+mZyY~Fd>Z#SslT}m|;Y}0Hs>J4n>ZmtVT+^(;0nvbIO_F5p#Ek7kxjGC5y)90@_ z8nkG#yGoc&GO>^S$N$&e?wGRJb>)L{b6b<(hc6Tw^-?}M?3L<2w>`W+{m@c_NKufB z&@5K-&PDJUeX(nfbjTxP=`n$awF!}^L^qGgX$8f>E!+tu;x|as081bdV0LT^FJDUr zQb6!M-D~GpYx1zoYwwrDP1tithCkDyzq0I>oh<3%>=VE^j-)3&)M9cLWVkN6A?)R<7!RuYo8-;d$6$2$Z@ovOzmR=L z&oJt9Y0&i<>8vuJVp7%Xd8}k}qzK;CBZmB<6{BbcRibQp8Z+m84~28Hz+qN|a`7WZEIarC zn5V_;6{|f64%PRJ+SrAlEkbi>Nuy(a?JT@zBk@oD$}TKh;;9|YN7n-2G0CcG>=ang z!A+hqW3l^)0S;%2?1ued&F7i#q4XKtG9UWx3?u^aJt?~$bmh>k9sMk36f0->)D(v- zkTrj95<$O2BwBpqc!K%jexh#i1EHn>?o0t!b}TKWdyU^k_XCN?0_Id)zb>S=JaSsP z7`;r8jdx8b8rP$l;6OTa$K9!dl#D+&$T@l<^CI&dL3-S1)TzX%2AZpnzq9L96Hn() z=L?&|^2|oqmmYIuEz}goF$#Mm)nOCo_t3N++^;!PfHE2o{;`O?CH~|5blHp17?Bw$1c}ZHmS+aCLvpc#1DS#9e|O-5mzjZF1b>=F zU$xbFtuLehn}IYi6AO@%@J}b?D8;)EcUVk!7p?`0x&x(kRBojtj`MMh16#QXRrbVA>-J<^Q=H6h(0ha8&Cogk{s;F z2IPXIBTvT11~;<-(Fp(Z=;gQVzhZSH1n;l`sR{qH`1d#Bj08-_{_2ec2W-avYE}{_ z#Tf+~T*dxs7xwS+`k(6h->X)M!AtDGcaX5KU_1^WALJPaSc3y73`xNW26McU_pg4& z*En&1FMECcwIdGj4hN7(_f@U`A=cl0A^!>ILHTo%^t-6({FZZs6;u{|A=)N45X} delta 9277 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

)Q^eHB z#${jJPY_eYAVTn1k(A9y_|AE=P!(*b-!v&_i-VkE+lK)e->cMeIeD-Ihfl&JuIp%h zo?=BJ!pHJ!mDjAcMx2yKC(1gd%f3uY5J{%z(l2VL;P4_u9NHc>WIBArgfQzE|47kt z^6s1Ur0i9DVU4uW@^ZQ%)tm#`8qciQ3_*=WVtQgJIv=?{L0gXS*MB&I@M|^WK zlX#J5tUoZyL-ZMvs~%OSR0ma%`U#|%U$X*F$rl%>IMUrtYK9XZnr?c$kW( zhTfU0iq86Y*u96k+5+h;)ajsOKD|E_G*Vbmyp&RlxP;e*KO2+a^!*R!msQR*DkL>3 zAmBj4fr3L24k0*%;SgaqDgZH9WRV`U#}F_VWbOb2ph06m4!U6oC?YvKplU-P?eo|Q z5sd&Rgb;Mg2(S<)3knEC9f5rCfHIU~3P=cR?E=;w3>X9QkfJUiB`yH}5CW?3zvC{5 zU<}wGG9j8VV1z(H?Z$vPVizQ30uT`mkdFyqjgWx~O#pp_F*INTSRgDQtSMlLJg5r! zngT}18F}c2DWHdthq_Dw3*?L{guw$Q2qZ*;FGx@qYRAKjdB%Vg6s7kKboqLYfY63i f&46tiznvJ@82*=|y~O(b2*tufq_DRE04M$fB_mLg delta 3118 zcmZ`*2{=@H8#goLFgH^fvNc1|Ot#7`#+s!ee3_AGs8DK@EyCC)V^>-fa?)4^*~{7> zqAtnJT4bFj(M8tmOD=tfy7%dJzwbQHd(QbU@9+Qq-rxH^&;R|3G`K2Vm=5DhxH$h- zKQ(Wb9IpQT)Rl4{JQpv79^}sr7%JqLewKP?X!(`YV6{}-uYrbijgKn zNXX(HJ*4WE>c^fRS#dNd_)lW-W!!|1MtxE-ANIwYD~~%axNuaR+I1pYu^$)b+fAQ2 zQF11&q{s|=a+88FNZ&bzLr@a z`k5ZYV$>9l@0LvnmlgWxVzBMLGF}GDeVezY+)chc-1Bv-1L>5@?}=3LDpTAGBx~H$ zju9~N>z2An(J_r`w zcfUn$vZKW$y<^SKj2~f++s_Qk9Ois38jC-z=7BxKej9u_>ErAyI|)9(v}3q*hJLPd zdnR92*7IpxOA^gFzg*a>!=-**>-w|SQnec^%89J2cqdxclTxR%GCx_sc;ctv)3?w{ z^k9flA}7{V19YTpbv8$?40;w>kGD2}XPr-C8o5-D!b?7++SSHs7K!rE6f;C zs~{v?DzTYtxU%d^I2q5BG1Sa>im}BdGMIzL>9<1J*5lPx)%3!bdp9k5vu$^*J@il~ zdt6v~T2+-)RW;rk&mn|MvEB?85}IrmBQFb!MiOa076s3-mHpi2+J;+a*>j<%r+t~L zs$b^LYc#tUxGuNm`f?h(LJgK@0;YZMiHxxm3JOZ}yhZ6sjhF7uUqY4j_;plM7~312 zv^OCGmTjM}Esh@kVpk=((nj0wvXE-$$(a4}blE}87mwLqFjo8U)K{N*ci-yf{1)Z< znM*NmW?E+^OpE;eb-MlNcQ!Y4)%vrQ0{2#Lch0MBR?e$ZZe&l?tYKZOIs{TSt6s;> zk4g4MXZF}zV;_}2GgmbDjUd{sfMo0*(RF)r^yKGOTkAj%S|E3=Bsj53((1HZf$MU| zk+mm-5mq3_`J{6FW%@`wJy|>d1cB(QkEy8I#Z{HkVjXNs988Y8$W_gUdzcvAQ=vzYFC$zeM5cXp=c~uU|t3`n+Q=3QM9C8hi&Ht%r4-p+eB`j&&Cn zLH-@cr>NKx_Oal|8Q#cw0qhX z5tysiXMR@`NTaBr+!)@7YjOgP#JpxB*7qvAf{shZuoTa5v`Q_>z8Y5FVwTC844Zy& z(){0bxPukDAcBIyW8H+s`2Vy3F=pu9vEd@pGOVA{)Z6CEDqa3W<*l<@hqjTmQ2()>ASjDEJ4nWE3Psuycf(FiOS`0LRFt+c5Z$h!B-zUj-9V zWg3~W!5ME(#tX`u2s#)jHE$D{c~?TM3$5FESITc|)RN z7$G))^M!K!FIUXv0$91^!=Dv9@G`4DCu zO_u0BtIPcsd&o|QyaGr$N{J~ZesSk$mW;L@B`L!714P;pYV$rd>UpEd#!?n=xr-4`9xa!Vs&M|9o?Sj5qyfLyF|4=R3e ztn>Xg!-dESLsv{@5o(+>LG5-a#F1=8Np*)rE3-OihbWwq0}CU=C8nGnAyobc$$*y3 zz`1^Bzrrlq=-!lxS2;D}Itqb-)S>!fttm+kthCv=sMl`xLMQhtEOcsn%(*$&3%OF(~(1VN1fH|6gIy^@V z{6iBs2zw1mXaTzL92xMG7N7}3fcKyeoNy5AfTj^n2LZ6<00ge34T10Fk2T?!P#~Ma n;AkE+4-XH(6KOV}`_FqTGz~p49%<-p3O>>X6gG(w0BG=Em%ox-