Merge remote-tracking branch 'origin/main'

ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrder.java

@@ -98,6 +98,11 @@ public class EbikeOrder implements Serializable {
      */
     private Integer paymentMethod;
 
+    /**
+     * 起步时长（分钟
+     */
+    private Integer baseDurationMinutes;
+
     /**
      * 起步费用
      */

ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java

@@ -100,6 +100,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
                 .orderType(OrderType.ONCE)
                 .startLocation(orderDto.getStartPoint())
                 .startTime(LocalDateTime.now())
+                .baseDurationMinutes(bikeInfo.getBaseDurationMinutes())
                 .baseFee(bikeInfo.getBaseFee())
                 .durationFee(bikeInfo.getDurationFee())
                 .freeDurationMinutes(bikeInfo.getFreeDurationMinutes())