From 78eb58dd4e6fcfba907cd6477f59904dcd40e380 Mon Sep 17 00:00:00 2001 From: lihua <531456470@qq.com> Date: Wed, 31 Jul 2019 14:38:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=A4=B4=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/redrock/assetmanage/dto/Material.java | 8 ++++---- .../assetmanage/entity/AmMaterial.java | 8 ++++---- src/main/resources/static/template.xlsx | Bin 9718 -> 9690 bytes 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/cn/redrock/assetmanage/dto/Material.java b/src/main/java/cn/redrock/assetmanage/dto/Material.java index a928f0b..b0f175a 100644 --- a/src/main/java/cn/redrock/assetmanage/dto/Material.java +++ b/src/main/java/cn/redrock/assetmanage/dto/Material.java @@ -37,13 +37,13 @@ public class Material { @NotBlank private String packages; - @ExcelColumn(value = "公司名称", col = 6) - private String company; - - @ExcelColumn(value = "位号", col = 7) + @ExcelColumn(value = "位号", col = 6) @NotBlank private String position; + @ExcelColumn(value = "公司名称", col = 7) + private String company; + @ExcelColumn(value = "备注", col = 8) private String description; diff --git a/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java b/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java index e79943e..13aca01 100644 --- a/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java +++ b/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java @@ -33,12 +33,12 @@ public class AmMaterial { @ExcelColumn(value = "封装", col = 5) private String packages; - @ExcelColumn(value = "公司名称", col = 6) - private String company; - - @ExcelColumn(value = "位号", col = 7) + @ExcelColumn(value = "位号", col = 6) private String position; + @ExcelColumn(value = "公司名称", col = 7) + private String company; + @ExcelColumn(value = "备注", col = 8) private String description; diff --git a/src/main/resources/static/template.xlsx b/src/main/resources/static/template.xlsx index 2b462065d87518419c4a8316e6d76c01b3a350b6..fedea1f4aa16854c7a78cca8eff7024d183dd715 100644 GIT binary patch delta 3101 zcmZ8jc`($C8(-`aawk`gvPjDkm0LpEweBOzT{)Ir_kDe9$x)~*UiW?NuKV7UlH3*% zYRQpSDRL#(%CEP1XPWsv^ZfD5e4d$S=6OD!=XrjjsHi$BGX$pP!$iQ(F`om{bV}lg zu)@<=%jTd}ROx_foGmoiO#@=J4a}*XZc5V%#Daf43D5>Yc0S}eVFnnre6g{qtkNpt6a$~VvU^F5<6J0)oY>Q1od*|26^kc2TVz>D;5hhs1dNl7HO zfd_S$Q*XZeTIO?(f_C#C2Cz4FUAXn5k@sKA>sHO-icYe3?%LKr{WR7hkuC6+F$({1 zAkaf9g54guO{~!@A7GPMD&`KJzI)56A+#mUa6F8`+Xo?zy+A*+iwDKkwX+&svq{IH zUEjXS2Q|&5YHt>RwNJC0es`*O9*d~xSmJs`^Bpm~wswbqwZ7P05#Ws!OupMBT>YB+ zSxE8r&Wx_6x>Evfu4U|M6ES*p%$4}EvarWQ$t5gfo&htFE&gmYXuIqr#8yw~7|T2H zRa#`Vd5=I7e1+o}IVOG}p}4Vb%><_iXCG`X&2W-MUy0Xvp-m(+ADpu(^!?hygF8rwT`^F62^9#mw*k$U6H^eE&{Y{%Zb%r&I5QNj>#aT{wtv)?J zn>e&o_|$ncMsl^i)?O~a*$7c9%Ok4p#;Wan!CT09VPnSkWgl>bfUec4&U%6|EWW|_ zWwB=a(v==Wui$r1tw99-^><|hc4n!0=@3PaBnOiCAp~E;%y?gw|iSg$p$v)pvl(P(T@>}g>Q?yN5; znEUX2Yh|+@n<^>@OOr!hGDI?_k_`KTkkP-|)D955-!iLgOQ30=KpFPKb1!mM)5GdS zK>tX@G)cWztzb8lpVJv!L7*SES-{2trTAJm2|M%jPp0AY+y!7se0i(H?f|vaXy|-D$|~{RQ>e`izZ@R*0>}}a zx2{!Y@pb(KukbwQdQuW}HXl|drn$~pVR7fJk*>e3r=0&w)v_15t2IUF$Kp(GGl`-z zl2uR`E!Xof+yfME*=%kq5d*~ercEuW#m^&nkv{Q#_50r7C4@Fkd`jHQg4e{rT^1SEv6Xmhp5PJe}@jOfrERYzE zPZ;63=O2->!R^P#lQ}DPUg%7R{_A+Y*MSK-8hak+)wFu!#jc!Bc1XPCxXrAfBcqy8 zaeXYz(qVowre_}&RQ+k=gLJNkj5?T3fSLB!`=9{<^PKQId{IEUFHAQ^-A2XD<6yNG_SAyEyu5ApeNz z4{cjGAF%++kos#uOdwD=2MF}rL7^ChfWR<}YXCeHi&?Ruq>LlDJ0v$at2-j-d>YUv zSbgc+tgO&dq0;BUE5T#MKvl5&q)T(_^L1!$n_VoHDi~r1Pk0RgnU4% zZ6|8meC$o0|B~@FTQ0#^bp@QdiWT z&sunL>-4F2+TAAJ|2Dao!Diu9`M@yL@|=9aJ;H2TP?@Z(XFJkYW&Ifeb`0O9XPZEW zOW?lPv=8*BS0=c4^<=$owG~W^+z6CRm-gbc61faj^Q03v%}TgTZhjMp1`jq9tL8QM?OFK)9S#KWs4GroxBMVg_k}x zvH2!4C>=69WH+4at1Ia)CU0YM!Vzvm!hDC!(&kDG_GGA^T597*;>F>foRp^TT+{d$ zVi;C2WA*)2fm0rj$Rja?9q6W(OipMApGp5vma)te{MG2X?6^VF*@p%*B@r#-`QHv4 zZhQA%WA6gfjKppQ@g4YF{!Ip`||)?z(yR#vudY)Zjo7(p?Xn;cX?P?!cvX@CGt zIs-($y1d^Fxk^Zs?G_>sq{wRf2F%QE`{cx|FhjQfy|OT=7DFAB;g%9R$}-O-QX}W1 zkwy-0`{z7ZfpN}WKsLsR zDl-7V6NIAGbuOmPg_nsR?GWE5o$+zd#_3iSY%8^hOM59l0N9y9HM}>u-YFmm^Gq*+ zJ}?J8n6R%jPI0u^S{H^)ns=kEVSR7J)52JDQ zu2Kk3$u%=a`zZs9&joHV7hMYinL>GcEdjYsa}&{SdBwL(Jfe?tIS|h;TC>a_*Msn; zHL51^(ielAOAi~1EDcO#XB-dmIQ@Dt!{L6uYgK|t#^d_N)b8~?K6*!J`0{m*`<_1C zAbuhDSfRq2OWoCTEwRpf^vnfwvX;x$YP(&pTF82PlzE~*N||oA-Ug2v0gLTwUMe*O ztY*g!;wMh=<5kJ5izG$k>lNUz70xd}q1fYzM=i z<Od1c7!SAduj1?)|k1{3pq)4E6YPP-&6> zzZ`$FbnsqK36cM2@Lzl$Uk<&(z=;0>HDdtd)uhx#{>=0@)17};<@uZVJF>y2NNF=n O;VDv*%=u^jh5iSY%fG?^ delta 3133 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