Merge branch 'release' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java

@@ -696,6 +696,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
             commodityCodeCheckQuery.setXmdw(orderExcel.getXmdw());
             commodityCodeCheckQuery.setXmdj(orderExcel.getXmdj());
             commodityCodeCheckQuery.setSl(orderExcel.getSl());
+            commodityCodeCheckQuery.setDeptId(entId);
             R r = commodityService.checkRepeat(commodityCodeCheckQuery, shList, false);
             if (OrderInfoContentEnum.COMMODITY_MESSAGE_ERROR_174015.getKey().equals(r.get(OrderManagementConstant.CODE))) {
                 log.error("根据商品名称查到多个商品!");