Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterMan...

he wei

2022-11-21 f590cd46b46d36610a3ed29591865de77d3e92ae

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterManager

 src/main/java/com/whyc/service/ExcelExportService.java

@@ -73,10 +73,12 @@
        info.setChainResGoodCount(chainResGoodCount);

        StationInfo stationInfo = info.getStationInfo();
        if(stationInfo.getStationName2().equals("-")){
            stationInfo.setStationName(stationInfo.getStationName1());
        }else{
            stationInfo.setStationName(stationInfo.getStationName1()+"-"+stationInfo.getStationName2());
        if(stationInfo!=null) {
            if (stationInfo.getStationName2().equals("-")) {
                stationInfo.setStationName(stationInfo.getStationName1());
            } else {
                stationInfo.setStationName(stationInfo.getStationName1() + "-" + stationInfo.getStationName2());
            }
        }
        map.put("dto", info);
        //图片