From a1532c5989ec2e4c9237ab13463ab0817279d730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 5 Aug 2024 11:41:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsMarketStandardDetail.java | 6 +++--- .../entity/LawsMarketStandardDetailExcel.java | 16 +++++++++------- .../excelTemplate/导入模板-市场法规清单.xls | Bin 28672 -> 28672 bytes 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java index 8f03a638..c1bda920 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java @@ -134,7 +134,7 @@ public class LawsMarketStandardDetail implements Serializable { /** * 适用车型 */ - @Excel(name = "适用车型(Vehicle Catagory)", width = 15, dicCode = "applicable_vehicle_type") + @Excel(name = "适用车型(Vehicle Category)", width = 15, dicCode = "applicable_vehicle_type") @Dict(dicCode = "applicable_vehicle_type") @ApiModelProperty(value = "适用车型") private String applicableVehicle; @@ -158,7 +158,7 @@ public class LawsMarketStandardDetail implements Serializable { * 类型 */ @Dict(dicCode = "type") - @Excel(name = "类型(Type)", width = 15, dicCode = "type") + @Excel(name = "类型(Requirement Category)", width = 15, dicCode = "type") @ApiModelProperty(value = "类型") private String type; @@ -231,7 +231,7 @@ public class LawsMarketStandardDetail implements Serializable { * 备注 */ @ApiModelProperty(value = "备注") - @Excel(name = "备注(Comments)", width = 15) + @Excel(name = "备注(Note)", width = 15) private String remark; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java index d7aef1a8..457d9d6b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java @@ -132,16 +132,11 @@ public class LawsMarketStandardDetailExcel implements Serializable { /** * 适用车型 */ - @Excel(name = "适用车型(Vehicle Catagory)", width = 15, dicCode = "applicable_vehicle_type") + @Excel(name = "适用车型(Vehicle Category)", width = 15, dicCode = "applicable_vehicle_type") @Dict(dicCode = "applicable_vehicle_type") @ApiModelProperty(value = "适用车型") private String applicableVehicle; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - private String remark; /** * 认证对象 @@ -162,7 +157,7 @@ public class LawsMarketStandardDetailExcel implements Serializable { * 类型 */ @Dict(dicCode = "type") - @Excel(name = "类型(Type)", width = 15, dicCode = "type") + @Excel(name = "类型(Requirement Category)", width = 15, dicCode = "type") @ApiModelProperty(value = "类型") private String type; @@ -232,6 +227,13 @@ public class LawsMarketStandardDetailExcel implements Serializable { @Excel(name = "要求类型(Optional/Compulsory)", width = 15,dicCode = "requirement_type") private String requireType; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @Excel(name = "备注(Note)", width = 15) + private String remark; + /** * 清单Id diff --git a/laws-modules/src/main/resources/excelTemplate/导入模板-市场法规清单.xls b/laws-modules/src/main/resources/excelTemplate/导入模板-市场法规清单.xls index 0a22715627b8d89f024d73ea194287004bdc6c22..53543055b724fd4670fda7cf3a6b0f8b74b869f2 100644 GIT binary patch delta 1496 zcma)5T}&KR6#nka?#{q&8GaU67LkP}&04_@!~VcZ7TlH=SVE;Wp;c2t+ASqP8n7jS z+AKv38XmCRrb(-bkG|AMI!}!aiAkf4jj?^H#u$Spn7*Me8f)tI+?me8rY3bJbI*L| z`_4J{=iIqG>O9@Jy_xyM?ABam z{G0kxmf~e)I-d@`YQER-ajA4W#djL7D~n1PKn-6oT3nUb!T3;QPk_M#1|L+!iL{?8 zL4F=@k%{CNBPW{zaF-Hw?wzHfFb*MuNu0$Prs(f2`X+D&A?(En*$n?FTI&j+i1Eqx zR=0ux7*EG^xq|FUY?rG}P;2cktD^FY0@Ngi6b1!C@o!|8(g61M;A?X{lxXB5(dXnU z@_!KxX&H>-G!>n}3#b*^XiTmq`(5lMxt^>)o|J3Ij>U~C6-+t$U_6Wg3ZYq1$Uj8g zH0HBR-^kRD^5x86$0=<%m^%XdZMLjE`f~qAlbBgL7|a>aVIYELvMolC2m(LI#e+$f=mCi4Cvk=e@xE0rR8% zcUjg?ZdDTV0{kcui7B;a`2_G|LJ_X6CqBvY*}6H_W$7q=LF^+Gix70eMWc-vA$J~0 zbXhzCWi6?UB(=XIbwQ&`;~+Po>OAt0vMP@hN~-3OO3I=d=r(G!D%&r1Vjn7LT*GeKeMacnZ#jS1+bX{TiR*ne$Gfak z6Vs7s?c0$;NbIZ4sRgKrka%paxPbE(ARoH;wZ7Uis+ZSm5Y>O^i&mtlyS52Y*jRgiW`Eu~LXah`J2(dy}3#i`gmp(s}<@w&P}3lJM1yye)WrMUS_deQv7 u{~}xI|5iPJKmFjhADL|a(qFIf)wJ*Wo8#sDv$V?3Oe{#g9`oUZhdl=U_Y&a% delta 1704 zcmaJ>U2GIp6#iyrf2Q5v?smJ|*+2)3vPN6FyHhJasoSz;cMVzDw9Q&+Dxlj!Fs&HV z1QE6>y2d_~a8Z7O@c|NEjjKKq;)BK*3<(bq5|avP;){Sjps8urb7!WTbqBn&Gkd@D zedpYB&fGimOTzq;@Z|>*J8ExdFG(`HZ;P;5DP8?XIxUz6e|6D*M`q(*h3)Zb!3aP< zeTY}pCA1^TKJltTgfXw?$YHhf;%N1n*Ve|q?(#c^NGO24=MS@hx|{9w1%zSN=2Js4 z9Fxs3`rl42WY?8Y@R;1)#AV2%SIE+HeRaQj!7m<8pNhZY^vIjYDa!W61Z#HPLO+M$=v6&{vwCRTiQnp@qYmyh3@8++B2U(P!Zd|&u$ zWNY3t`rydQSEHkHkKUZ*~C=THFac6xNoQat6)b{hfR&-0ZZ$J$4gjaj@!TB|N<>OR$;v!oF*xs^n(g}Mrh6=0*?UN-t40)x5nW$Ct3}v8;&L@j0qnbyjTEj-# zmX%)6_5?-}z%2n-&;Y*;I7s{To}=pAvg~qHhJj$N`e*vOP!5t-7Wok*8@%K}L-6S~ z4uY6*a#PB*iMq|u%?l}ACpFl(?r#oxP@S|9>Zl_- zb|PFy4nq7ZW-Q?()LBO|`6+eOf&o3Yp=>2Y=g0JO5#mi+1-qKr=<`uFYZT4dADLt~ zuRTLY8@K|M-kgB!V=oUom`zG4`V4-N?R;&RPN)%0r1P2r?-)-)BzubHYe>cp+H`BE zYjJ$bPzM zQXc`VquM22EWLI8g6ABix+E`C%BBS#+@}O&_FJxUYS%US?6>E;?%o!p>aV-Hd`x}O c{nf-90r|m`zyH9^?CqHo;^(>Q%8Wz!7vTd2CjbBd