From a8abe717b152e376d2e49f7e3e95cd25841edc1bcbe86354338cd2c865debb53 Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Fri, 24 Oct 2025 13:49:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8C=BA=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E8=AE=A1=E8=B4=B9=E9=85=8D=E7=BD=AE=EF=BC=9A=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E5=91=A8=E5=87=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/dto/EbikeSpecialBillingConfigurationDto.java | 4 +--- .../com/cdzy/operations/model/entity/EbiekSpecialDay.java | 2 +- .../model/entity/EbikeSpecialBillingConfiguration.java | 8 ++++++++ .../com/cdzy/operations/model/vo/EbiekSpecialDayVo.java | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSpecialBillingConfigurationDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSpecialBillingConfigurationDto.java index a2185cc..242dd57 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSpecialBillingConfigurationDto.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSpecialBillingConfigurationDto.java @@ -2,7 +2,6 @@ package com.cdzy.operations.model.dto; import com.cdzy.operations.model.entity.EbiekSpecialDay; import com.cdzy.operations.model.entity.EbiekSpecialTime; -import com.mybatisflex.annotation.RelationOneToMany; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -42,10 +41,9 @@ public class EbikeSpecialBillingConfigurationDto implements Serializable { private Long createdBy; - @RelationOneToMany(selfField = "regionId",targetField = "regionId") + List dayConfigs; - @RelationOneToMany(selfField = "regionId",targetField = "regionId") List timeConfigs; } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbiekSpecialDay.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbiekSpecialDay.java index b88d453..2ed600f 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbiekSpecialDay.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbiekSpecialDay.java @@ -40,7 +40,7 @@ public class EbiekSpecialDay implements Serializable { /** * 周几 */ - private Integer specialDayNum; + private String specialDayNum; /** * 起步费用(元) diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialBillingConfiguration.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialBillingConfiguration.java index f3a3f69..764f0cc 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialBillingConfiguration.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialBillingConfiguration.java @@ -2,6 +2,7 @@ package com.cdzy.operations.model.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.RelationOneToMany; import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; import lombok.Builder; @@ -11,6 +12,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.List; /** * 实体类。 @@ -49,4 +51,10 @@ public class EbikeSpecialBillingConfiguration implements Serializable { private Long createdBy; + @RelationOneToMany(selfField = "regionId",targetField = "regionId") + List dayConfigs; + + @RelationOneToMany(selfField = "regionId",targetField = "regionId") + List timeConfigs; + } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbiekSpecialDayVo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbiekSpecialDayVo.java index c632b77..b2b4310 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbiekSpecialDayVo.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/EbiekSpecialDayVo.java @@ -28,7 +28,7 @@ public class EbiekSpecialDayVo implements Serializable { /** * 周几 */ - private Integer specialDayNum; + private String specialDayNum; /** * 起步费用(元)