Merge branch 'refs/heads/dev' into test

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -1635,6 +1635,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 + "' AND '" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, sOrder.getPreEndDate()) + "' )");
         SOrder order = getOne(queryWrapper);
         if (ObjectUtil.isNotEmpty(order)) {
+            baseMapper.updateSOrder(sOrder);
             logger.debug("订单：" + sOrder.getOrderNo() + "和订单：" + order.getOrderNo() + "预约时间有干涉");
             //退款
             AdminRefundRequest refundRequest = new AdminRefundRequest();