Merge remote-tracking branch 'origin/master' into xinghong-dev

xiaogang

2021-08-20 47f882588d1d18df404478bc79cc53cb608549a2

Merge remote-tracking branch 'origin/master' into xinghong-dev

 service-front/src/main/java/com/java110/front/components/assetImport/AssetImportComponent.java

@@ -33,7 +33,6 @@
     * @return ResponseEntity 对象
     */
    public ResponseEntity<String> importData(IPageData pd, MultipartFile uploadFile) throws Exception{

        return assetImportSMOImpl.importExcelData(pd,uploadFile);
    }


 service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java

@@ -103,6 +103,7 @@
        Map<String, Object> info = new HashMap<>();
        info.put("carNums", carNums.toArray(new String[carNums.size()]));
        info.put("communityId", tmpImportCarFees.get(0).getCommunityId());
        info.put("statusCd", "0");
        List<OwnerCarDto> ownerCarDtos = BeanConvertUtil.covertBeanList(ownerCarServiceDaoImpl.getOwnerCarInfo(info), OwnerCarDto.class);

        for (OwnerCarDto ownerCarDto : ownerCarDtos) {