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

nightFragrance-massage/src/main/java/com/ylx/order/service/impl/TOrderServiceImpl.java

@@ -739,6 +739,9 @@ public class TOrderServiceImpl extends BaseServiceImpl<TOrderMapper, TOrder> imp
                 throw new ServiceException("仅【待出发】订单可签到，当前状态：" + ExecStatusEnum.getInfoByCode(execStatus));
             }
             update.set(TOrder::getArrivedTime, now);
+            if (CollUtil.isNotEmpty(dto.getImageUrls())) {
+                update.set(TOrder::getArrivalPhoto, StrUtil.join(",", dto.getImageUrls()));
+            }
         }
 
         int count = baseMapper.update(null, update);