Merge branch 'release' into test

# Conflicts:
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java

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

@@ -1005,8 +1005,6 @@ public class OrderMergeServiceImpl implements OrderMergeService {
 
         //对比合计税额的误差，此处将不参与和与参与合并合并对比
         BigDecimal hjse = mergeOutItem.stream().map(t -> new BigDecimal(t.getSe())).reduce(BigDecimal::add).get();
-        log.info("合并前{}",oldhjse.toString());
-        log.info("合并后{}",hjse.toString());
         if((termType && hjse.subtract(oldhjse).abs().doubleValue() > 0.06) || (!termType && hjse.subtract(oldhjse).abs().doubleValue() > 1.27)){
             return R.error("合并失败,合并明细后价税合计超过总的误差范围");
         }
@@ -1014,6 +1012,7 @@ public class OrderMergeServiceImpl implements OrderMergeService {
         OrderInfo orderInfoNew = new OrderInfo();
         orderInfoNew.setId(orderInfo.getId());
         orderInfoNew.setUpdateTime(new Date());
+        orderInfoNew.setNsrsbh(orderInfo.getNsrsbh());
         //OrderProcessInfo orderProcessInfo = orderProcessInfoMapper.selectByOrderId(orderInfoId, null);
         OrderProcessInfo orderProcessInfoNew = new OrderProcessInfo();
         orderProcessInfoNew.setOrderInfoId(orderInfo.getId());