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

dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java

@@ -727,7 +727,9 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
             }
         }
         //uuid
-        scanInvoicce.setUuid(StringUtils.isBlank(pramsMap.get("invoiceCode"))?"":pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo"));
+        String uuid = (StringUtils.isBlank(pramsMap.get("invoiceCode"))?"":pramsMap.get("invoiceCode")) + pramsMap.get("invoiceNo");
+       // scanInvoicce.setUuid(StringUtils.isBlank(pramsMap.get("invoiceCode"))?"":pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo"));
+        scanInvoicce.setUuid(uuid);
         // 开票日期
         if (pramsMap.get("invoiceDate").length() == 8) {
             scanInvoicce.setInvoiceDate(DateTimeHelper.parseDateTime(pramsMap.get("invoiceDate"), "yyyyMMdd"));