From c8e040fa283c3a690f31d1d23b84d0be0c1e6799 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 4 Nov 2022 14:16:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=9B=B9=E6=94=B9=E4=B8=BA=E5=9C=A8?= =?UTF-8?q?=E6=9B=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/IcPsTripReportRecordExcel.java | 2 +- .../IcPsTripReportRecordExportExcel.java | 4 ++-- .../excel/ps_trip_report_import_template.xlsx | Bin 11193 -> 11235 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java index 4410c61293..c0841b4a29 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExcel.java @@ -38,7 +38,7 @@ public class IcPsTripReportRecordExcel { @NotBlank(message = "来自地区详细地址不能为空") private String sourceDetailAddress; - @ExcelProperty("来曹事由（100字以内）") + @ExcelProperty("在曹事由（100字以内）") @NotBlank(message = "来曹事由不能为空") @Length(max = 500,message = "来曹事由不能超过100字") private String describeContent; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index 73af0b78d0..bfdd634a1f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -56,10 +56,10 @@ public class IcPsTripReportRecordExportExcel implements Serializable { @ExcelProperty(value = "来自地区详细地址",order = 7) private String sourceDetailAddress; /** - * 来曹事由（100字以内）【磐石】 + * 在曹事由（100字以内）【磐石】 */ @ColumnWidth(25) - @ExcelProperty(value = "来曹事由（100字以内）",order = 8) + @ExcelProperty(value = "在曹事由（100字以内）",order = 8) private String describeContent; /** * 48小时核酸检测 0:阴性 1:阳性 -中国字 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index c5a91432ad7f868b9f7287e8fa95804b4746186e..6b325c4fe83ba70e3adaaa9b4593131be1ee0543 100644 GIT binary patch delta 2795 zcmVikp1@?lt8k2~qO$e($Qlb8d2-6Ujx- zSCbQ{JqP1(P=5@I z9-HR$R1>rmlz@vp0WVdBZVeR5Fnfy{#|41W*1Fl381tZZ0%8ixDOL&T%i+D_I_7>x zKkVw;Z74@^4AeH^uVd8XEW?2FoYt))J)16J{sQbC8oPI(QGSq%)&d<-Req35xa5d> ze{UUS;TE|9XK3m++^+xk0XHfzb$66s<*nJoER`IU&fT*a@1PXvS?x1 zbP%!3YTGI39cb#9g{S8khjWHqSU_H2os4644sQyyTAEr!8=0lA;Id$Cgr1!oa_zHJ z>WORFeMqK2G6x#bq2I?c2N*IkQf1K(1?xQ)B)5bn_&XI()9!BGw7nTHmH2z6?G)8GO z+dY2(009600{~D<0|XQR29v!b2eJ*>3I*F^!vi<7-WON{e@uZ=4JlY$@i5EjPIf~E zdnm<}l{96K&O{g1(7uEsSiTlgQoa#PUzbn>+aH9KNkO_`{6h&vu>O%`Ai?|%2}Lk& zQ$i7}dmK`9Tw?3$f_YCQ97C{gOU6kIoLWuT>crKA*5Qf~R?|Yf%#t*cZ=9@~HFYW8 z6oZtO0f`brfAC+4x0#>_{@apJ1pjSw3frsoWn*Dw0S{dDID~A$_ z;FTjz;oUYwpeX{!Au!b}Ct{=41ds}AY#gbuzWE@;ebX*kZppL39>_w3PGv_*(JyxLG}q!BS<|$lGS?5NSy?0Unl|Cr^Z>#H4oMYzDhD~@vf7|j@ZB3$0icoE!WvC5@uQ`O_$(IO2^-{jf zLZ_V&VN!$&11&>gI5Ey43|ZKOu<6UJMTAKaDh#v?g>9PFCiB3oM>Q+?CEARoDNZxA zO;dcNNfD|Iv<$VCObZ9(IkctH5Myzwwi3}MMW{B=GSr4+{T#wlc?fFCH?K59f7>R) zqzDxTT86?Sa{1YTVE;#DNYlpYda*pk|IEecxfN82pxsX3Dc$4Oe?`?fw>$Dx#dclq za?`c@4}w?3qjT@F+8j&O$Kfchu$y+hF@njbfu{yG^~bRC@wE7EhiOTb@rN(ff4DHGqac@_+5dH>c#RV~3e&m%{Q32#&#r&-nfC3Mf8}@I zJd5tGe*OFK?u|_ssYp#`#_LaiclF{cZT#~;zy9W>_Ug&!?DG0&f4TnbzuNfe7vFyU z@f(|R75T1o%Fq9G_1>Sf>*xQ(<&Dj*Wm+xS>|VWiGXCJH#x8&Oe^?uT`9AwKe)d0H z-q>6Zb?Zlg36 ze)%M%Ocx`pMD~&Z%fDt1&$`%4T&IKg5rrK4(rg%hLmB??y+N==-1mHZOBvjr<6~6^ zuT~1|1ICW$`TPfa2T>J&{<{7hldmHc1fP1vq_amMGy#94n?pm};Rm~NAXrhn3(46Q zY|@fMyZw99cB>rt04g#mn6SWoZHr1|cyjDkS8?ap zVapo@^6pUFO0A4?-gfy6{|*FPZ$B_WM!|;-_NO<>>+JraT%jT*X&O@!lSN5p?CORQ z^4`6F*5COJ7y4-NFOkM%UXlf)b2g_F;t5dn-sgX!_y)7EBS8iVcZl)?^a20?8U~a5 zDN+I%4UU;+RD5dZ)H0000000000003W;5Gy_b;FC`)JprbZjVmSw3@HEr005S&64n3! delta 2756 zcmYjTc{CJ?7akgn-7t2NeHm-<7-by^g)w0m%Sg5viA3d*$;2p<(FobcmY#hKdLmgS zCP`tkm0c8LO_rDD=l$M!=e+yZJ?DPsyZ3(gkMGW-{zTPt@bTFRt-B6z0sw1VWPUzb zd}f&Q1On1Kowp}%H$B?Cr|%8GXpgIpnFBsJ*_WB1vspe*G)q9w8Fv`nDtFSwIyK!b z_jPNRnr|1#SYe`WQE7iM!-Js<}z<=h$6Lp-FJD0^^&*TH`YBmv=8nGsn*2S=S`8?0%3a)$?qrHZhiG{CC7Y?f zF5s9pSV&R1oqCyi%o2-ZeK(==SLV-P?QI*-cD_G+{Fie6(mbrM2{*nk*Su6rwU3vd zmk#cAP7l!Y+kHRQeiyxI_0Ef5&c!pH#D8PK@^^fA+R2-#$Ei@m=sf%t6g&1+lc>F1 zMvtcb^p0<@1)3=vrt$iBhkiPEu|=*~;<2Hw_QhSLtfq4ZKvSMv(}2CNlGVdT-2;QA zk|vTX`2~#%d@_QL1M{{)vrz9Z)oB~!jN;y+$3xEOmB{aO!=6(J{@w6iM4(=>t*ut_ zXu9iZxt@*$YG*^f&z1AuqiGZGHwIS4GtyTl3hA(iUx*s$s?fxXrITNmxLFTabZyDa zyO*Y!XZmv&6Za1TG%`{{zQs&G{~;G8u2C>vnk&x(LjDXvPeI|t4UMHRWXGU;c?&`H_ zG$GW3`do>*z^t;2xcPw3)z8jvR!Ei61ac5cd-%GZ$qNV|JIr2#z;1>mv6u(chI;B9 z9-3zTn|vdKteHi5-m@E#XRX0)-j5MLy>%iaD~Im;8<*bthpQJl8Gng7%+1eSb0;H! z>Laiu)qz#)jaLcx8N9x*Oaw4i;Tqq1vm&P>*hDDdSr7~?+oX2K)#LKKUDD0~kK*x8 zd^MNQReNAE;QVnhV_t)cDJH4cs&oif#L6y^aK_Z zQc+8r*qzgTJI;p0ZIugzsrB(%p~3$8r=R{5SpW2HFt3_RG_mJHImpvK-;NYU$mFHM zNqkm+0LNAPj$8fUMJn5w*^r)IzbR*fx4U&CIP@>liE}`#NSQt9G9h0C$bxzWUl zh`n66RAJnGeOJB3e(k6UUa;EPO8xgIAw;oxxh_(YBPj3XTeM9Mgwl1?b*us#c2fB5 z@2-uHFeL*XxpRi_NkjU%+<#{BV$dQi3*lZ`f(8;#aZqp=G7)#wJj~?dprZEU6B zZHH5|FeUtj6vUAL(L`NZ6-jfwSHhmD0HwDKvEoXO zDG2NlSWrA~ycG%Sqp3GhSfZZD#5bHea8ILQ>;2$ns;emBCffMc+xj&rblSi2!4I*` zwXU25!Yjenh%={X$|dJh5I)6$m3V%)#v`u%WCJruo=rA{(t5O-WD349x_l@di+xOy z7yFn0G%?a&i-(xhBG9-~jwH<)CbTxghoG9)T!bu&Wm{`*4YVM>IAL`}x}tm1CJREL z9#OgXyUJ7$vbh`S}xgF^yEA0re0I8q}zwgTUjUTLTU*$U>rP_9%7nqD=B zPbzbkgTz4-EMVcB4!-}!i{~YC5|Uugt9idrt_9a$C}Z5NjPB?f`@CSExOMi7>8@_o zVP_HsKKsrbZYDAnF!Li~S@5FYUbH(Lm1}C!P zJ!BgHb-XEG-$ZV-pira7VPbna9>T%R&sjNCO&(;5i=jm?p{nA*g>=i1zvCewQx+L zrsI%Vm5m9V$DfgBvr zaxK-ZOmqD03_!sz+Odt-6b(7>G&+UC+PLcj6RFmiN?N$W{~Ok>g zmhVC0taF_w1pu7}hQ*e#$-^pi3r}J9KP_a5Z?vD4S>)&syWD&y5vT3+wViyiex9o+#Hs?-8L{lvLlQzPR$Gv0vl>CVR_>x8S^djXGzW{wQSOfK>N zJS`G&_plEL=29@7DAF>n+dqW2Tf5m(wVmuQNEk7`G6hu^+VSk_j$K*3kq>hie;IO{ znz3O&_GJ#(`3`QwoGr#Q{>NX}ly$iO`$MW~Avw1M$T3