Merge remote-tracking branch 'origin/release' into release

order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java

@@ -125,7 +125,7 @@ public class YpyjTask extends IJobHandler {
                 for (InvoiceWarningInfo invoiceWarningInfo : data) {
                     try {
 
-                        SldKcByFjhResponseExtend sldKcByFjhResponseExtend = sldKcByFjhResponseExtendMap.get(invoiceWarningInfo.getXhfNsrsbh() + ConfigureConstant.STRING_UNDERLINE + invoiceWarningInfo.getSbbh());
+                        SldKcByFjhResponseExtend sldKcByFjhResponseExtend = sldKcByFjhResponseExtendMap.get(invoiceWarningInfo.getXhfNsrsbh() + ConfigureConstant.STRING_UNDERLINE + invoiceWarningInfo.getSbbh() + ConfigureConstant.STRING_UNDERLINE + invoiceWarningInfo.getEntId());
 
                         if (sldKcByFjhResponseExtend != null && ObjectUtil.isNotEmpty(sldKcByFjhResponseExtend.getKcmxes())) {
                             List<SldKcmxByFjh> kcmxs = sldKcByFjhResponseExtend.getKcmxes();