Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java

@@ -7,7 +7,6 @@ import com.dxhy.base.file.handle.ExcelReadHandle;
 import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity;
 import com.dxhy.order.baseservice.module.taxclass.service.TaxClassCodeService;
 import com.dxhy.order.constant.OrderInfoContentEnum;
-import com.dxhy.order.constant.OrderManagementConstant;
 import com.dxhy.order.consumer.modules.taxcodematch.emum.SdenergyTaxCodeMatchEnum;
 import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch;
 import com.dxhy.order.consumer.modules.taxcodematch.model.dto.SdenergyTaxCodeMatchDTO;
@@ -183,12 +182,12 @@ public class SdenergyTaxCodeMatchController {
             }
         }
         if (ObjectUtil.isNotEmpty(errorMsgList)) {
-            return R.error("9999","导入失败").put(OrderManagementConstant.DATA, errorMsgList).put("isPass", false).put("count", errorMsgList.size());
+            return R.error("9999","导入失败").put("list", errorMsgList).put("isPass", false).put("count", errorMsgList.size());
         }
         if(sdenergyTaxCodeMatchService.upload(uploadList) > 0){
             return InterfaceResponseUtils.buildReturnInfo(OrderInfoContentEnum.SUCCESS, null).put("count", uploadList.size());
         }
-        return R.error("9999","导入失败").put(OrderManagementConstant.DATA, errorMsgList).put("isPass", false).put("count", errorMsgList.size());
+        return R.error("9999","导入失败").put("list", errorMsgList).put("isPass", false).put("count", errorMsgList.size());
     }