From 3bb1fe3eef8328471cf83b751e8b81b2ca3ff41b Mon Sep 17 00:00:00 2001 From: jing's Date: Sun, 10 Mar 2024 20:20:21 +0800 Subject: [PATCH] =?UTF-8?q?+=E6=AF=94=E5=AF=B9=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/api/user/BomReportApi.java | 21 +++ .../bomnew/constant/ReportConstant.java | 2 +- .../bomnew/excel/CompareReportField.java | 57 ------- .../bomnew/pojo/vo/CompareReportField.java | 70 +++++++++ .../service/BomNewPbomParentService.java | 10 +- .../bomnew/service/CompareReportService.java | 144 +++++++++++++++++- .../src/main/resources/template/0.png | Bin 0 -> 2372 bytes .../src/main/resources/template/1.png | Bin 0 -> 680 bytes .../src/main/resources/template/2.png | Bin 0 -> 2017 bytes .../src/main/resources/template/sum.png | Bin 0 -> 977 bytes nflg_project_dev/pom.xml | 2 +- 11 files changed, 234 insertions(+), 72 deletions(-) delete mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/CompareReportField.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/CompareReportField.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/resources/template/0.png create mode 100644 nflg_project_dev/nflg-bom-new/src/main/resources/template/1.png create mode 100644 nflg_project_dev/nflg-bom-new/src/main/resources/template/2.png create mode 100644 nflg_project_dev/nflg-bom-new/src/main/resources/template/sum.png diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java index 083a1bed..ce19c106 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.product.base.core.api.BaseApi; +import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.ReportConstant; import com.nflg.product.bomnew.pojo.query.ChildBomReportQuery; import com.nflg.product.bomnew.pojo.query.CompareReportQuery; @@ -13,6 +14,7 @@ import com.nflg.product.bomnew.pojo.vo.*; import com.nflg.product.bomnew.service.CompareReportService; import com.nflg.product.bomnew.service.ForwardReportService; import com.nflg.product.bomnew.service.ReverseReportService; +import com.nflg.product.bomnew.util.EecExcelUtil; import com.nflg.product.bomnew.util.VUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -132,6 +134,25 @@ public class BomReportApi extends BaseApi { } + @PostMapping("compareExport") + @ApiOperation("bom-比对导出") + public void compareExport(@RequestBody CompareReportQuery query,HttpServletResponse response) throws IOException { + + ResultVO resultBom1VO = checkQueryParam(query.getLeft()); + ResultVO resultBom2VO = checkQueryParam(query.getRight()); + + if (resultBom1VO != null) { + new NflgBusinessException(STATE.Error,resultBom1VO.getMsg()); + } + + if (resultBom2VO != null) { + new NflgBusinessException(STATE.Error,resultBom1VO.getMsg()); + } + + EecExcelUtil.setResponseExcelHeader(response, "BOM比对"); + compareReportService.compareBomExport( response.getOutputStream(),query); + + } @PostMapping("forwardExport") @ApiOperation("bom-正查导出") diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/ReportConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/ReportConstant.java index 1a1c8422..316b990a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/ReportConstant.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/ReportConstant.java @@ -79,7 +79,7 @@ public class ReportConstant { @AllArgsConstructor @Getter - public enum SymbolEnum implements ValueEnum { + public static enum SymbolEnum implements ValueEnum { //比对 EQ(1, "相等"), diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/CompareReportField.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/CompareReportField.java deleted file mode 100644 index ef3ba1e7..00000000 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/CompareReportField.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.nflg.product.bomnew.excel; - -import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.File; -import java.math.BigDecimal; - -@Data -public class CompareReportField { - -// @ApiModelProperty("汇总") -// @ExcelProperty(value="汇总") -// private Integer levelNum; - - @ApiModelProperty("物料编码") - @ExcelProperty(value="物料编码") - private String materialNo; - @ApiModelProperty("图号") - @ExcelProperty(value="图号") - private String drawingNo; - - - @ApiModelProperty("物料描述") - @ExcelProperty(value="物料描述") - private String materialDesc; - - @ApiModelProperty("数量") - @ExcelProperty(value = "数量") - private BigDecimal num; - - @ApiModelProperty("单位") - @ExcelProperty(value = "单位") - private String materialUnit; - @ApiModelProperty("层级") - @ExcelProperty(value="层级") - private Integer levelNum; - - @ApiModelProperty("比对结果") - @ExcelProperty("比对结果") - private File compareSymbol; - - - - - @ApiModelProperty("数量") - @ExcelProperty(value = "数量") - private BigDecimal num2; - @ApiModelProperty("单位") - @ExcelProperty(value = "单位") - private String materialUnit2; - @ApiModelProperty("层级") - @ExcelProperty(value="层级") - private Integer levelNum2; - -} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/CompareReportField.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/CompareReportField.java new file mode 100644 index 00000000..27624cdc --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/CompareReportField.java @@ -0,0 +1,70 @@ +package com.nflg.product.bomnew.pojo.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.ttzero.excel.annotation.ExcelColumn; +import org.ttzero.excel.annotation.MediaColumn; + +import java.io.File; +import java.math.BigDecimal; + +@Data +public class CompareReportField { + + @ApiModelProperty("汇总") + @ExcelColumn(value="汇总") + private String sumSymbol; + + @ApiModelProperty("物料编码") + // @ExcelProperty(value="物料编码") + @ExcelColumn(value="物料编码") + private String materialNo; + @ApiModelProperty("图号") + // @ExcelProperty(value="图号") + @ExcelColumn(value="图号") + private String drawingNo; + + + @ApiModelProperty("物料描述") + // @ExcelProperty(value="物料描述") + @ExcelColumn(value="物料描述") + private String materialDesc; + + @ApiModelProperty("数量") + // @ExcelProperty(value = "数量") + @ExcelColumn(value="数量") + private BigDecimal num; + + @ApiModelProperty("单位") + // @ExcelProperty(value = "单位") + @ExcelColumn(value="单位") + private String materialUnit; + @ApiModelProperty("层级") + // @ExcelProperty(value="层级") + @ExcelColumn(value="层级") + private Integer levelNum; + + @ApiModelProperty("比对结果") + //@ExcelProperty("比对结果") + @MediaColumn + @ExcelColumn(value="比对结果") + private File compareSymbol; + + + + + @ApiModelProperty("数量") + // @ExcelProperty(value = "数量2") + @ExcelColumn(value="数量 ") + private BigDecimal num2; + @ApiModelProperty("单位") + // @ExcelProperty(value = "单位2") + @ExcelColumn(value="单位 ") + private String materialUnit2; + @ApiModelProperty("层级") + @ExcelColumn(value="层级 ") + //@ExcelProperty(value="层级2") + private Integer levelNum2; + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 889830fb..71309be2 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -36,6 +36,7 @@ import nflg.product.common.vo.ResultVO; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.ttzero.excel.entity.ListSheet; import org.ttzero.excel.entity.Workbook; import javax.annotation.Resource; @@ -223,7 +224,7 @@ public class BomNewPbomParentService extends ServiceImpl result = this.getBaseMapper().workDetailsExcel(userRoleService.getUserFactory()); materialMainService.intiMaterialInfo(result, BomNewPbomWorkExcelVO::getMaterialNo, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); - new Workbook().addSheet(result).writeTo(response.getOutputStream()); + new Workbook().addSheet(new ListSheet<>(result)).writeTo(response.getOutputStream()); } /** @@ -238,7 +239,7 @@ public class BomNewPbomParentService extends ServiceImpl result = this.getBaseMapper().releaseListExcel(query); materialMainService.intiMaterialInfo(result, BomNewPbomWorkExcelVO::getMaterialNo, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); - new Workbook().addSheet(result).writeTo(response.getOutputStream()); + new Workbook().addSheet(new ListSheet<>(result)).writeTo(response.getOutputStream()); } public List getChild(Long rowId) { @@ -396,7 +397,7 @@ public class BomNewPbomParentService extends ServiceImpl child = this.getChild(bomRowId); List result = Convert.toList(BomNewPbomEditExcelVO.class, child); - new Workbook().addSheet(result).writeTo(response.getOutputStream()); + new Workbook().addSheet(new ListSheet<>(result)).writeTo(response.getOutputStream()); } @@ -408,8 +409,7 @@ public class BomNewPbomParentService extends ServiceImpl result = Convert.toList(BomNewPbomEditExcelVO.class, child); - new Workbook().addSheet(result).writeTo(response.getOutputStream()); - + new Workbook().addSheet(new ListSheet<>(result)).writeTo(response.getOutputStream() ); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java index d472b578..04d5859e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java @@ -2,21 +2,24 @@ package com.nflg.product.bomnew.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.TypeReference; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.support.ExcelTypeEnum; import com.nflg.product.bomnew.constant.ReportConstant; -import com.nflg.product.bomnew.excel.CompareReportField; +import com.nflg.product.bomnew.pojo.vo.*; import com.nflg.product.bomnew.pojo.query.CompareReportQuery; -import com.nflg.product.bomnew.pojo.vo.CompareReportListVO; -import com.nflg.product.bomnew.pojo.vo.CompareReportVO; -import com.nflg.product.bomnew.pojo.vo.ForwardReportVO; -import com.nflg.product.bomnew.pojo.vo.ReportBomVO; +import com.nflg.product.bomnew.util.EecExcelUtil; import com.nflg.product.bomnew.util.VUtils; +import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; +import org.ttzero.excel.entity.ListSheet; +import java.io.*; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -28,6 +31,9 @@ import java.util.stream.Collectors; public class CompareReportService { + public CompareReportService() throws IOException { + } + public CompareReportListVO compareBom(CompareReportQuery query) { ReportBomVO left = SpringUtil.getBean(ForwardReportService.class).factoryBomType(query.getLeft()); ReportBomVO right = SpringUtil.getBean(ForwardReportService.class).factoryBomType(query.getRight()); @@ -56,32 +62,154 @@ public class CompareReportService { } - - public void compareBomExport(CompareReportQuery query) { + /** + * 比较导出 + * ∑ + * @param query + */ + public void compareBomExport(OutputStream filePath,CompareReportQuery query) throws IOException { CompareReportListVO list=compareBom(query); if(CollUtil.isEmpty(list.getChildNodes())){ return; } + List excelList=new ArrayList<>(); for (CompareReportVO compareReportVO: list.getChildNodes()) { CompareReportField compareReportField=null; if(compareReportVO.getLeft()!=null){ compareReportField= Convert.convert(CompareReportField.class,compareReportVO.getLeft()); + }else{ + compareReportField= Convert.convert(CompareReportField.class,compareReportVO.getLeft()); + } + if(compareReportField==null){ + continue; + } + excelList.add(compareReportField); + + + if(ObjectUtil.equal(compareReportVO.getSymbol(),ReportConstant.SymbolEnum.EQ.getValue()) + ||ObjectUtil.equal(compareReportVO.getSymbol(),ReportConstant.SymbolEnum.NON_EQ.getValue())) { + + compareReportField.setLevelNum(compareReportVO.getLeft().getLevelNum()); + compareReportField.setNum(compareReportVO.getLeft().getNum()); + compareReportField.setMaterialUnit(compareReportVO.getLeft().getMaterialUnit()); + + compareReportField.setLevelNum2(compareReportVO.getRight().getLevelNum()); + compareReportField.setNum2(compareReportVO.getRight().getNum()); + compareReportField.setMaterialUnit2(compareReportVO.getRight().getMaterialUnit()); + + if(ObjectUtil.equal(compareReportVO.getLeft().getTag(),ReportConstant.TagEnum.SIGMA.getValue()) + ||ObjectUtil.equal(compareReportVO.getRight().getTag(),ReportConstant.TagEnum.SIGMA.getValue()) + ) { + compareReportField.setSumSymbol("Σ"); + } + + + }else if (ObjectUtil.equal(compareReportVO.getSymbol(),ReportConstant.SymbolEnum.L_NULL.getValue())){ + + compareReportField.setLevelNum(compareReportVO.getLeft().getLevelNum()); + compareReportField.setNum(compareReportVO.getLeft().getNum()); + compareReportField.setMaterialUnit(compareReportVO.getLeft().getMaterialUnit()); + + + if(ObjectUtil.equal(compareReportVO.getLeft().getTag(),ReportConstant.TagEnum.SIGMA.getValue()) + + ) { + compareReportField.setSumSymbol("Σ"); + } + compareReportField.setLevelNum2(null); + compareReportField.setNum2(null); + compareReportField.setMaterialUnit2(null); + + }else if (ObjectUtil.equal(compareReportVO.getSymbol(),ReportConstant.SymbolEnum.NULL_R.getValue())){ + + compareReportField.setLevelNum(null); + compareReportField.setNum(null); + compareReportField.setMaterialUnit(null); + + compareReportField.setLevelNum2(compareReportVO.getRight().getLevelNum()); + compareReportField.setNum2(compareReportVO.getRight().getNum()); + compareReportField.setMaterialUnit2(compareReportVO.getRight().getMaterialUnit()); + if(ObjectUtil.equal(compareReportVO.getRight().getTag(),ReportConstant.TagEnum.SIGMA.getValue()) + + ) { + compareReportField.setSumSymbol("Σ"); + } + } + compareReportField.setCompareSymbol(getFile(compareReportVO.getSymbol())); + + if(compareReportVO.getLeft()!=null){ + + } } - } +// EasyExcel.write(filePath) +// .needHead(true) +// .excelType(ExcelTypeEnum.XLSX) +// .autoCloseStream(Boolean.FALSE) +// +// .sheet("Mbom") +// .doWrite(excelList); + + +// final ListSheet listSheet = new ListSheet() { +// Long n = 0L; +// Long pages = 1L; +// +// @Override +// protected List more() { +// return n++ < pages ? excelList : null; +// } +// }; + ListSheet listSheet = new ListSheet(excelList); + + EecExcelUtil.eecExcel("BOM比对", listSheet, filePath); + + } + + +File getFile(Integer type) throws IOException { + + String filePath="0.png"; + if(ObjectUtil.equal(type,ReportConstant.SymbolEnum.EQ.getValue()) + ) { + + filePath="1.png"; + + } else if (ObjectUtil.equal(type,ReportConstant.SymbolEnum.NON_EQ.getValue())) { + filePath="0.png"; + + }else if (ObjectUtil.equal(type,ReportConstant.SymbolEnum.L_NULL.getValue())){ + filePath="2.png"; + + + }else if (ObjectUtil.equal(type,ReportConstant.SymbolEnum.NULL_R.getValue())){ + filePath="2.png"; + } + + + ClassPathResource resource = new ClassPathResource("template/"+filePath); + + File input = resource.getFile(); + + return input; +} + + + + /** * 左倾斜 或右倾斜 * @param leftNode diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/template/0.png b/nflg_project_dev/nflg-bom-new/src/main/resources/template/0.png new file mode 100644 index 0000000000000000000000000000000000000000..fbe555de2ddbf2e8ec28c0da21bb5eb4ce10bc4d GIT binary patch literal 2372 zcmbtW`8(9@8aHEJgk;HhZPVA#C^VL`wP?mVk|l=hTTGVMRz!_qYA~T>Ib?aQWjD$0 zwH9TjjMpwp_7Fz0hj6}~bN+yHo%6$Uf3DB--1q%l&-Hw+`}#zinHU`B7UO1PV>@n$ z(=`W?@oRB$fRSeXDvOQn7>}VY79a8_YaDw=$Z(s!wiBbD(xrbi9_}8~MYfvNd>djy z*2EIQ0Qn{anDorUQiU#%pw8~?9V(3@A7Yg&U6zb-mFyi4g)GwY%Rc@LLk{y>CB#h? zmhH&NSMjrbLIPxV2tU>H6ibvfI3EG-0uYyFI3#$#~)JOFbIGD;^l~ zX(igE)ahS(#jX#$+-`3xf_#{cK)$;jdG9>1;m#%}t4t>=3^>;RegN;hu3teX2Rbxq z+3#OT_zGDR@s=hCT$oEa>|4o4?Q|qXdnR;6>sg~n-x|~FggeJ?^9>P+a_io#0N{A8 z$@Eh#ioICa<;kqmTH6}&P}1P1!O`XN!-Z>7Xu-by$~w!mxB-?gt0LzX-h}CP;b#bf z^>}IMH(j*4Q;O-BYwbBy_|q$h>WpGU?1*ElwRq%&QGGIGcPP}bi7{i!5i4#P2)H_~ zD%sn6xS~ExRC?tK36Y3KzQ&t zbZCIi63JUm)Z%YFS zJwq!Tz7@zE+L&bZed%Ao1dR0U>gy#)8VCFX$4jZs;TnCd9QR}N75L*MQ z4r+{5TNMQB(S-P@-k}vWuYUs}o&#iB{{d(p|7e5f6ucBt9n{~uN0vxwrY;5Whw_3G zhH$7#S@KpbC52kUV_ZKc9hMff=-P_LQ!1U{mRke(+NRdX1kOQ{1xZW7loFO(jRvU8 z^4+=~o_Pr2k!4|TQ|+!ZpjKyE4*FN6)O_{l@e}FrXQ6znO#|s@_%ucdCGIuYIr99~ zYQC*NeEU|iz%<4TCBC8PVA|_fp-r=dw$Ni{PH9CFe~P{=d6X&3X+PJPF7*I|pL1a; z11>0W5&DloK~;d$Jv?ba!Xy3K!JgVTUUSPbGrbMD#d%(+0>$$n|JuJsEH2w-MRw^1 zyZOmBBA<1XFULz+Z-qJiSzqD0o#ik!FAQ8By=BQ%27C%0ur~Awn_};{CEp|11q+sH z%%%5i6>Jo&K8q-46-g^32cL-RZl2Hw1Qw z?zR3-RKUGKN@Pggqj>6J2!z(_PB+!BZ*>pf!cvQyc!c>pjgH?LbTvIYW?9u(L4Ooy zrkN)E?3_%B7m(Q3HVl?w^szlok~Q6ZkwTf4aF zi+XM=89zL1CqgU6j^etqqW+3^Qberr$9vlkU?(Q`Q0sZci>JDzfyn?o9|xB3%x2p9 zBoiUoA@Ij!K!98Nj;9GhMGUd;=NJ`ormsBJPseRgd@^{>c&om=RGh_}@L>Ws&(%t; zPvW$Lp8E%$I?qt|Se}uK+4SofdT$B)0`+kSJpsw3@o>fjjyCu+T5yFl9uWd4EPuuW zj$B&osSgd{76@v*NX5L2EiA!i%vR!=}%` z3s9Af@6)XcUjX!$-k~mStMd%%`rrDNq_A0{b#!;7Ps6&vn?t`54JXpHe#&Wrm4 zs%<9{Jp|qkDhR5CWc}LSgS3c zl+N92d&1$66pHz|C=WIU^IGT)Hn~iMsF4=nWxjs~Ewt;SQ9#S6+GIDkZl1B7d+Agb z5Jj9%Ji$0v+YQU4U@hG9&v!aoj z^NCJgcLu@f<(}*tJKWycn$d;!s`QJDJM$4T6;)aP9=i1ZI)(quUw~EABhV2Y9pxxA WDJF_Iy#?J7o1vbG?kjEQNB;zd0#a50 literal 0 HcmV?d00001 diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/template/1.png b/nflg_project_dev/nflg-bom-new/src/main/resources/template/1.png new file mode 100644 index 0000000000000000000000000000000000000000..02f5dc09f378fd87205d44406fc009aff72cbd1d GIT binary patch literal 680 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST~P>fhph9#WAE}&YL?MJxv^C+8^HS z=QjV*W$@kWLdXWejndp3IJhI;9AILZEwSUp0j?Tm-nQ1~nGeMGp0S@*&;3EU(LsQN zWgv-`%WEEf{`adsMsNG(Zi9d$$hkbc=m*^RGwVjw99K5U(1%y*)qow%sv_@0-6d{!msI k8_;M1TKb%7 literal 0 HcmV?d00001 diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/template/2.png b/nflg_project_dev/nflg-bom-new/src/main/resources/template/2.png new file mode 100644 index 0000000000000000000000000000000000000000..02d6533fe18b5c909f12a7778d0caa48042286d2 GIT binary patch literal 2017 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 literal 0 HcmV?d00001 diff --git a/nflg_project_dev/pom.xml b/nflg_project_dev/pom.xml index 70f5eb88..5c5c19b8 100644 --- a/nflg_project_dev/pom.xml +++ b/nflg_project_dev/pom.xml @@ -57,7 +57,7 @@ 2.9.0 5.6.5 1.9.3 - 0.4.14 + 0.5.13 1.3.17