From 8f94b5ba2e91dca839fea0b9c85b5a1b6f0b1072 Mon Sep 17 00:00:00 2001 From: chinabugotech Date: Tue, 22 Jul 2025 10:57:13 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=A2prepare7.0.0-M2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-ai/pom.xml | 2 +- hutool-all/pom.xml | 2 +- hutool-bom/pom.xml | 2 +- hutool-core/pom.xml | 2 +- hutool-cron/pom.xml | 2 +- hutool-crypto/pom.xml | 2 +- hutool-db/pom.xml | 2 +- hutool-extra/pom.xml | 2 +- hutool-http/pom.xml | 2 +- hutool-json/pom.xml | 2 +- hutool-log/pom.xml | 2 +- hutool-poi/d:/test/comments.xlsx | Bin 0 -> 5138 bytes .../d:/test/templateWriter/templateResult.xlsx | Bin 0 -> 7152 bytes .../templateWithFooterNoneOneLineResult.xlsx | Bin 0 -> 7291 bytes .../templateWriter/templateWithFooterResult.xlsx | Bin 0 -> 7257 bytes .../templateWriteWithBeanResult.xlsx | Bin 0 -> 7248 bytes hutool-poi/pom.xml | 2 +- hutool-setting/pom.xml | 2 +- hutool-socket/pom.xml | 2 +- hutool-swing/pom.xml | 2 +- pom.xml | 8 ++++---- 21 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 hutool-poi/d:/test/comments.xlsx create mode 100644 hutool-poi/d:/test/templateWriter/templateResult.xlsx create mode 100644 hutool-poi/d:/test/templateWriter/templateWithFooterNoneOneLineResult.xlsx create mode 100644 hutool-poi/d:/test/templateWriter/templateWithFooterResult.xlsx create mode 100644 hutool-poi/d:/test/templateWriter/templateWriteWithBeanResult.xlsx diff --git a/hutool-ai/pom.xml b/hutool-ai/pom.xml index e0290ba2c..7f326b1e5 100644 --- a/hutool-ai/pom.xml +++ b/hutool-ai/pom.xml @@ -9,7 +9,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-ai diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index 744f67cbb..eaddc7f97 100755 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-all diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index f4019ea8a..aa0454439 100755 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-bom diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index c4d092b6e..45ea71723 100755 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-core diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index 55589a328..7a1cacdbc 100755 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-cron diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index 974fcac83..d4f7fd2ec 100755 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-crypto diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index 19cca8c5b..23b7f4989 100755 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-db diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index db3a42e9f..1f1edd47b 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-extra diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index ed43fd029..7f0aa9152 100755 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-http diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index b20f8dd83..3e3569bfd 100755 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-json diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index 15c5af6da..9b20f23ea 100755 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-log diff --git a/hutool-poi/d:/test/comments.xlsx b/hutool-poi/d:/test/comments.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..e095ad8da4100fdeb42b8245ba864ff7d8a09438 GIT binary patch literal 5138 zcmaJ_bzIZy_aBXv0}%A}|pzjihvU zhXTJ1{e401y`H_ceg4=vJMli}d7noUgo8^7AS5IN9BJ(u0nW)4^s})n1ngl0_AuA= zcC~?;a(THp!=HWvzvltU2eNKfs*srK>d9MZ4cSEL9%6yTn5hCjTAKxqxnU>0EC?lf zySyK}R>NRSqgJV4=S28AopZ31x|GCuCZ{|q!T)dbEyZL@N`0agj;GE9sGCz=esfrN zhMdaot3@A2K;P2xU=zWq<%lYO(dUK|;Y`XZ87%vIpKyHHQ%(Z*o~{ghS#2z zUiL3BfxUwjtp73j(V>d~NI?g)=Wph5*tr{6cpyz@c7?m{ZfEN-$ScJp$=A=>Sq^YO zE<3qnBYdmcGPb%${MifaiZ)JBDQnBna{uiZ;!oUj$yHNqGNLEMW09!gi8tbC79}86aCm{?=B(|AG#5N_hoLA! zL_{wEb>iS?X_~5%!e|2m8CB^ljhy1SGj_uJ@uB1+WrPk_W_Hknp5QF|!Gi%hFJXz| zRjI4UdDlrLe05!m#$kz`P;G;@aUHEB@~9wbmQg3uWhpFBQ-sxuM>>uQC$!|s5V>!6 zS|y_IfDPyG=ZoVc(;>zoB37%)B<+dE<6;ebPt=h)|&1RS17lot1AY*YOzQnG=W={15;MV&aS>M_didqe?bhd7vUCj2}H;?d4lq2K>qZ1VHrSVP=xF!8v=nSz>l zD8o-wQ2uHB*&;H-%xzMd*M;1?t|eF-J4+~KjUFQ$GOqU4v8+KE)W14HdvOi{j6P0| zCexHRc)H(wtq=$pg1i$@U?$4`U_siukBbFKRT1GTdX!N`=C{oJa+)^?WH800(0b`o zIS!{xCSl@xgC+Rmg+=4ZP`@jjK!pXoE?^jiR-AH5P4nXp71nFHzI#m^nhAdaXjMsa zP{f-}3hN@@MS0kWy-AK_Vy04_6g~&hU7dCf+!Nw{v15B!hdZKcC-96x4mT_T)|v=P z@?+~LTuM8lx*J{2m;H>!+PBS1Yt#KmJKlUNaec|zADTq809auFvw^*fQ7=-{G%!g# zadfZ6M|Vsa`u*QY#9+e9ncEuT;({J)P+m+9{eUPatMt|m3cp@SQgM1n$5l*Cyg8wQoq!E*3%{mgns!%?qHoQl> z^@k@VErX(Eh|_ksg3o7$KnHgGTl`S}2>rghrKbbf4$A%W;WP!T(IBD_9-!2oxO|F# z#(+FKa$dnFco%?Fjj@nu4_(}#o8R1EfTa9gUC3SLENnP0N*dXnaFnc1y!K`55av)% zl5Yn^wZEBBR+S}w)o%r~xkQ=aQKRX&nfL#dEW)-rx zG`g8x@9RsW1?)OGRYdpH+}MMI;2}{^gh7;-c3u6eV>j>lqt}tD#TXrbbJc(P`c6S33P84 z;QX$?DSsdZYH#Uob6>~99fNdCkBdi3lf7pG0@fOWmq)pLcv_zBT1*meV}%xn<#0U3 zo7$S0cH>K=nS+eu-1PvPnsVj?j~cfY7yZ;HDSauZZ7b zob;#X9^TG2r!M#Dn?i<}DE-Gur0Pr5%M03W4)^J^_n7T=s}J2SD{Srjym+fkNO|i3Hbz+A%X6d}F*A z%M}-|&9=g=_$Za7(q4+sH`iEmKc`!P?~$wyTcyBXDogU(EK!5YBJt6;Q}f>>-d^Bf z_sBO+lKW6J;(z zax*U`7J9FQ+b&`$A8u{zz3d2paglLy#ldhQW}_k?_8f;$=E}rxsyE{DIiY0HMiVfS zqi<@&G_I~-gQfn#pJNQGdl{8CcR>JQ(MlsC*SqThAI=^9p<47PV9*bAFYj= z<7M1xQ4G*{zXXT-GHE_p%LFz0i&{P&Sl~+nCu}z!X587P_?({~2Vqvlnbj8D0jqW% z^ZVLZ^6KooW#IP^V!<91Ox&87PYpmS6Y&q4&chT*9Ve$5U03T>$vYFns}@X;!=3B| z*1v+K+K(Ghj_UXNr`=y4ol<9K0h=#F=%7u1O9W_tq~!;DKA)T)Ogdi8sfmX~>Ljwu z->n--oek!;?sSq2fR!c*@t4Kq!ap^Z)HU@>5r}THM6df^t}qFV2@%nnmB7bQ(+kP6 z$X=4Q8!tWa^1*8kMos{6Xi^?qB8(a)94(+O# z{+6UEt^GYA&NQG&^+EI6fw<_xZnjgOsHW@u9Yo4!I5worqv7xErBADe>X5BM4=Isw zd|1-DKgy$N1d_lqfG={zb|B=LdRQ+FmC^$WA8ei2tYS6r?ACD3oxhhH-iIIG!6|Gr z{IfGtWL=Du*`5?M)LAVtFUFa%ZRIDgY2#DXubdfM2_Xw#&(?Q~!kOd^_J8hRnEZKy z#;BAe__;c;?<3;@m}E!kO=w%XQNa5N29wd!5ocCKQDdrbwM+^!m0e?y2p#dq9GQx! zce&mVQw9(P6G+V!KTU%BE$Xk|?WhzI#RvUikvshF(K-%Rb)a%_BCo%OkN zgH~6|M{ouAwGDXK&_KteCq&q`&JTKwhdB!5W@{;g(YU1fZTfHgz~;I1|A6UP5q^U7 zvm?3^F!SblGtmW$XsxPeeDiRR%S_HQk6I+}fh!x1OcVyN*|$5>LUS}2yKVPY@OiZ- zCA>)CZ>8eyB6l15*1Zq!A%e!EzfJH`dlU+M`zxb;sSK zmCKkUt-nj_??tCT?lehQ*pz^?3ySl5G3J8eSNWIg3Qf?j2F|aJnDzNgve9)pw@hDD zJinx2wum!9qW!$MXI|7kznx$fxig7F^O^r?|NmNdQT;r_|Mk!NaR0f`T+}{KvN5fF zCY|W(1@t=fuRFm-E9VIqhLE306#lPPF3|IfhR*XL3|~7FIN_V2;K!X+^^Uos08l!A0fs(-U)moXJ;`Q|13SPA=LxKL&m+$TxI2 sKb`o;Ru65NWrTXA=2ixnwWN^l8M+@Ux@3Z*#3i#<5! zzT4iu`_5#oKYvy-v;NGUwP$93stO2*1OQZ2R6w2P*-OB0hJSyr2Xb_91v|JJX?i(< zT@2Vf?d|F`2OT;&aIRDPW|%ooRJ90$K$N{ir6&mbJ|LDS3qRNhZrjK}PgB*=BpbV5 zS-4v~m*>j*AoSt`)jO;*IF#a2R=~ zI?-vsWx3Z)Vag_iG@jB~34&5BN-iX+h9v@hJJ1#B?G?1=sZ+L*M_X{Db*`F=j&IH< z>Qp%e%L!kxH2$zq`Lu|pji$e8Y)fm%DNYb?t35{%p+@inHR1;9KkCA+ulNyJIf^Lj zvkiwhyAVa`+ZQ~>0~r|^eVuIIH0iyy$uZ;^R7j-yC#D6Kjq0`%R)Af3o@wjL)|?Eg z$a;Wn{jdsoV?(B+g%hFf`F_e!jLo;PLSqt?RJ3>B6|ZqSsLL_!s=5@kM{K8=cCf)0 zsMbdmoomjwt)RBML6H#P@sFjDp}XWGMpXqARQ2R7135SVAPx}#Q2l?Az_>@k$Qf+s z!p`<^tw@5(BXHt`8_^H7X4@m-TF*zLw!WT1d7M1ARGqCTE4|d#3XO)?i9^jYhRy@7 zhulRY<}PQ+JOxB5_r(aITTW}T$jX|=?F%B4q3SONRy5R7aifF8 z>6UB_cE#Wnx?Y>+y5=Cr`)wLBexf}qn`+N=n;GCPg?W_Z&ZNig9p2+F?AJPjCF zvt4}=>Od6AQFP}JVexLO&*1U*TC!O`_=oJgzlogMxc~3+@c)z@ocmvxJDRCFJ36_r zn>aZ=6lrdfxN;W=Oh=EfD&L+2QNUOMjAV@~SefGN>2WRX)i?k!EbdT%KLSnOl_dNupU>Z}EtZQ%Q%+ zD#D(II@LU9ks*;Pnkc3jIYZ;C)Q+(xdLFMzx*Sq3qabO)sC5wfQ^Z_x-f9D?Il4I8 zYey>!^R92i$8}gq!2B6J-zOU-jf5Z*EOl3Sp+*&IyE&?z{I?O6IU3lH~cr#<~k#rCr{xNnOG6#K(3dLgfup-nH# z;m1SYqNa>})V_ij*52`aP4lfWsbw4;eJTW0&P5!KX1}^@gYac$CBH*04o%~2$a%QQ zZa3V^{iGFD@kQ$eXUaKa059R$FE_dz%*n@F+x^pS1{2@{cDnovuV$~uUA=Xrw`_paOSIuoq( zPT7$G4R;s43bjl;!T5d}hT|wUl2+5XUHV?)Q-s6g5B81YP2UTImSj~!T=2pL_!cki zb^0oiy_SqT19mjV&Q8u8CtQh=!8s#Oxy+uKFnK*;ZHC&yo9V}fQl3tNAs?fzj(0g!8NPo^|&-Xb2B7}+PNO1yD zu&S-AW~l2AFW7w>S>0uvzk(gw7y<-hnnc(u-dN5Hs@!6H7EpDMJ*4{T2fO+@i1Aui z1eH`CLuTlGH@vqp0y@JZH$V0Ij^+Kdm+)YpF7ueDkL>Xrf+Q$_N^1vvuQnLp5eLx# zLv=gWpD%_c2v9u2863yKe>Y`CK*a`8BmcEL#!{G6)pHGC+)#`eCXSQI~c8!}}P`Pn;^`3l{kKt`5@g1o$ zBYwrQ!Ro;EWCIob79nIiDTP;BO(qs$eEs#b)ZU#FeO|P~*CJV47rti&Z*7_)=}#P2 zuX!_FXKDw3CfN{t39}m`PE?NbM*@nVUtv6eWtqF5X?qWr)<2Ry*1y1V^|Ay1h0?Un zaNGhfPTM&X;&R>3ny>TW8&rl>fdFeY<9e~GPm=wT7iOwc+REd4?0!jk-q_yXCkeir zr4-UB82WhB#f{T7MLrqvJs!pkpc^sLO3^u&CCI2n^?borjicZhrArY+d0^@TZ^+t~ zN$e~$wuek@J#K!+V5#51BaU0r0$|YIhz)bpg4aQhBgCDRZOj!=PPD@b>mh{E6iail z0aMDJI=`PqN1T)ZsjppB3b_NjKZs|Ho1>zJtr;}d;VajxuJJJF>|<(Um~D|$tL2~? z9x56#DMVP3D35WzE9G`Go}ezp83p~2=sm^GFYnHj4Wb%;z3=o8?^@zC}G8Hbg!L+I9Y4LPi0_D@?K@|B{JCmZYCgkNisif*Y_lgGG zUCh9cDb*F->!xPlyV}(XbcQilU2RYz9Ew34GT{TrQ4&gZSxZ3A%s2l0G)6L1+VSOi z7@w!0`k>$$c(PjIpr`BQADY8nDj>S$a44vSsTX}acN#8Ny~s%Lg9E8z5V`QQ)8nyd zlb2h=_8?{IG2EJ6k6SH2xxjhkQ9j}W@q#IMLZ;GCSHH`;d3F(>%4!Uw3_ie|Vd3XRG|$QM8`kZatvlAyQD=iWIdwz!MP z%dr!GHcLi%FXo#&?l76Dh5nQ4ZKpPofp`F>;piLMjN*6ht%$hJ<+%O>O%*DunweSw z4lQ!0>ET5x<&e^|!D8L6De}FNcx|(DlhLlaGP{G7qA!M)_Rzhw-873n%#2&xU>9jM zG9J6;FX0&1hVOO|gw^0R1MoHHq~tI$`UCKkC@l=cLaJ}xDV{QZ#i(ijq>ku^HyJ_a zty}~gN3aoA%LUVVhG*Y4C-FCSbPGi65i3;^`58^{;MH7KGy`p6cg)u3Ny1J1JKjhE zqiP>AEOoaDze>j! zdi-uIFMKeS9C>DNnmMnj&F9AUAZrz$jbvyzFbmO;<7wmso>Dc|<$^L%km37c#~<&l z&Kp&3YOVxN^o1xI^T=aXyYpgX-jPS-wUeR@W^+99S?uCwr`7L07W}cQXc~oTv6XOZ zU{n@W*rbBE`YF|^>FN8PfCrus5CG!rApiiyc>gs1JdEl0r0!}3wg>-x<$U1uJ>9{3 zwjfwKe~P$A-b!zaqhdVhK4HOt#+6K`?3V2*wAoe?u5i8s!6oz~JxN7=qq2%v2%ip!ktQIK0S@+bX9p*7sM$B4jh%Hn zo}O-`#-Q>Ciq%w>t3$N3jyQGX$5T9p*h61v1U=6p;X@l$Yua*KSR(>*Pp_S-z^-q) zxYw(U0(@_-^@Q_EFJ83!o^GFuE`QA{KTL_r(Yu zb~dP>b3Ri-agv0Mu02C3F@bXqngXEEI58iNJTWG(M9HT1l?{{L3goklC(~DP7F?G_ zXvrnUTH&N_kSTHJuP<+#S{)itgbC!9He3O6c77`J;yuq$>M@rQOqY8^_UynU(LMo+ z=UiYzYl&ksL_s|jxx*>XWMbYKE7P|HSBTZmMEa_AoK-WjWylRts*J2gz~AZw^-JSH z*D-@S3r3(D8?{5|5ktl+RV$JZ`0_s54j1zNWC0~II7@wV!H|r{A)MxlmM-ZdWUh`F z_T%qw9*;&dBsselgDBu6G|k`S&7Dp$t5RGbESyj*V4A zQD$6~w&a#xLd=)|qnT(wur9khwc$+o_|G=m4Z}39Vm#EsNe{+%u3zX@tz{*bn-iUO z{c0k4SmsBvb#&ylyMJv8J89kGlp_&iFRWyx(+iAlY90>eZv7XNfrC7Jy|KIT>H2m7zKONG$(W4z z89&H*cJi&tbFK75ar6oM6ca@Hdx<}zj&Au;!4pa<6LxT#`VtOv<_~-|lz9cJBvPn3 z%CKvdgv;ABt|=%nHSF3rjf&%X)bHw|nZ_1cVAl|DaK0x^mfvWG@Y=m>cG~_2`csur z<}n+CMF^}#!S^Ekt*Y%#sh77+^I4oQ1!~HEC;2NE4~t_2kC0(qTc&UFy7S(Y;?nUw zLkH38+n6reuuG#TpHTBlx<+ky-Db^n1&1Nvc81FC+Z{%SgipKf99EZkj`j26Gq!Fa z9WKa0X6HWp8n^^`#LBAY!UX5so|S$}!QCZ!q5B+XYlgE?t^3s*=RSMdIiaoEqKf&q z)o&2@JTIo6jnK~?c)zB6G+!|$my||1uQjvRKzLcXa9ZHtv*PiF4Yn?er+45SwUK%I zQXV~8RwB)u8MeXiaKmOv9iHxc*^XHiN^y(u&<#*E6A*`y000Nlf9eLU^j?t7?cwT5_Av1DD9&U^zREs8h8gSQ?DEhNM}v=`Kgm|ca}9r?0T1m$#fi2F)G!<9b9m7`@@Mu7BzC3Pe-NV96OY$}*u zi#fEPdxn0V zdlAYFm!YG!yoU$G} zM0M0@7-8(;S$(Vzf={CWOK$~}aH@sDQSu}wYr?U*vids~5^1fwufQc9MY5I&a5K$s z*#)j|K|3=Yoyi1%|Fc|i#7HoF@m}+Rx>s{0g8VN;A9gQ z-g{1@FLQDP=B0kM)$3=;d)gES3*jI|>Ly84=0AH)>1y^PYR{JZRSz%260A9l!dUd$ z_&ZAZ0-=0cq z`8gLS(^N+I(%alCwy(@c0|XFVkj<$2RkV7G8F$E+P>+;FzML%PI$>r~gymVzo{~&k z2NF!;Iqnm%1X-v%nI*{^Tl3~kXvfZEoS($hW*L_fwttdX{7-X&q_%?u>t3Rg0|DXo zbpd?Qv*INuQkCANnOx$6f^=M!Oy2seBOc$jsvhSdW)l)!B0yX8u$n`&?FGt1Rm(EL z5og{nt?L&+_z9clwe(uRZ7=NZ;&84D%HFo{#Y zrq6roJp-g|V|7seDt94my<{i9fmY(G*K_Hg@q$xsmfrM z_;aH@6sPpCc3cn!XYtwX?~0ZuV527$a$lF}HneoxOds97hDOIO`2WQKtJ>36U+*)~ z@Q+LW<6jKmVg&}fy4>&k_iujy)OQfmjh8u@1UpTz!kb zDu3?YV3PnRA3mcv(=>`^Vk0^4r8!)0SIdy^m} zs_W<&`@}k_Kdkiy^BaMcXhVzJh{O6pfaX32)!NQ1x0(&O8^dt>!x3-S8b;iQ0;z zw`!?&9NT^51*y%+jxmZ68LWjA^=%3%Srq~oZTcW5H;t>;YHxf46EM;yP(Kx2Yh?bM zpDc|TS?Gn^A11tI{=gdBPpt;KIJO*c_d%ldDnQe$tlGA_YAWUmUO<&5TNS&KexA5# zRm8%r&*a5!B-x#vuwEui z16ljDqluzH2!kJRUyJ7nCT79RGYj6vVPw0gMx9l!$gw=$dL4)#$DoOj%~mMA)CgiD zEHBOITkgMIF6_)c zSyu{QQTloGl8)SS65Vk=o{v13Z?D%j(RGFT{G`R>3Qj=@+oaSRzeZ`YCsH}a3P4NR z9f`~Vv1)pJ^col2xI5(W5#TeC5^;ft=?OB2cgSPCFSW>K(ZwTMIeXgb%7YSy6g26K*1fojGzs{~rk%zb-me^kgZ zZko%qwj3<{?q=;Nz0!BewV`^js$*L)V-SY+X2C! zj=$@%4{G@@E4inVKeh8ey?@shA2i!vW_&MT{oDJ072H4Fe^$nK|NRjEhwN1qknWo*0Dyk~3cSbpCCS65{{aQR BSO5S3 literal 0 HcmV?d00001 diff --git a/hutool-poi/d:/test/templateWriter/templateWithFooterNoneOneLineResult.xlsx b/hutool-poi/d:/test/templateWriter/templateWithFooterNoneOneLineResult.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..ffcb306aec899e5c9c000ae8ea074dcfdd86061e GIT binary patch literal 7291 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 literal 0 HcmV?d00001 diff --git a/hutool-poi/d:/test/templateWriter/templateWithFooterResult.xlsx b/hutool-poi/d:/test/templateWriter/templateWithFooterResult.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..98f60a34707b143c3623107acce3fc965545f34d GIT binary patch literal 7257 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 uiXM>o@7(xjoZqYJktu%JB+kEo#Q)9d literal 0 HcmV?d00001 diff --git a/hutool-poi/d:/test/templateWriter/templateWriteWithBeanResult.xlsx b/hutool-poi/d:/test/templateWriter/templateWriteWithBeanResult.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..16f3e12151e0689b1061019cf9077bcd208239f5 GIT binary patch literal 7248 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 literal 0 HcmV?d00001 diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index ac7b5699e..640a79cd0 100755 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-poi diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index 3b8b54dac..810dfd64b 100755 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-setting diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index 629cc307e..a755ffebb 100755 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-socket diff --git a/hutool-swing/pom.xml b/hutool-swing/pom.xml index 532e040da..2bba967d1 100755 --- a/hutool-swing/pom.xml +++ b/hutool-swing/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool-swing diff --git a/pom.xml b/pom.xml index f9caef949..cf477f0d1 100755 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ cn.hutool.v7 hutool-parent - 7.0.0-M1 + 7.0.0-M1-SNAPSHOT hutool Hutool是一个功能丰富且易用的Java工具库,通过诸多实用工具类的使用,旨在帮助开发者快速、便捷地完成各类开发任务。这些封装的工具涵盖了字符串、数字、集合、编码、日期、文件、IO、加密、数据库JDBC、JSON、HTTP客户端等一系列操作,可以满足各种不同的开发需求。 @@ -290,11 +290,11 @@ 0.8.0 true - central6 + central - true + false - published +