目录修改

car-wash-admin/src/main/java/com/kym/admin/aspect/SysLogAspect.java

@@ -6,8 +6,8 @@ import com.kym.common.annotation.SysLog;
 import com.kym.common.utils.HttpContextUtils;
 import com.kym.common.utils.IDGenerator;
 import com.kym.common.utils.IPUtils;
-import com.kym.entity.admin.SystemLog;
-import com.kym.service.admin.SystemLogService;
+import com.kym.entity.SystemLog;
+import com.kym.service.SystemLogService;
 import jakarta.servlet.http.HttpServletRequest;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

car-wash-admin/src/main/java/com/kym/admin/config/StpInterfaceImpl.java

@@ -2,8 +2,8 @@ package com.kym.admin.config;
 
 import cn.dev33.satoken.stp.StpInterface;
 import com.kym.common.utils.CommUtil;
-import com.kym.entity.admin.vo.AdminUserVo;
-import com.kym.service.admin.AdminUserService;
+import com.kym.entity.vo.AdminUserVo;
+import com.kym.service.AdminUserService;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;

car-wash-admin/src/main/java/com/kym/admin/controller/ActivityController.java

@@ -2,11 +2,11 @@ package com.kym.admin.controller;
 
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
-import com.kym.entity.admin.queryParams.ActivityQueryParam;
+import com.kym.entity.queryParams.ActivityQueryParam;
 import com.kym.entity.common.PageParams;
-import com.kym.entity.admin.vo.ActivityVo;
-import com.kym.service.admin.ActivityService;
-import com.kym.service.admin.RechargeRightsService;
+import com.kym.entity.vo.ActivityVo;
+import com.kym.service.ActivityService;
+import com.kym.service.RechargeRightsService;
 import org.springframework.web.bind.annotation.*;
 
 /**

car-wash-admin/src/main/java/com/kym/admin/controller/AdminUserController.java

@@ -6,11 +6,11 @@ import com.alibaba.fastjson2.JSONObject;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.common.controller.IController;
-import com.kym.entity.admin.queryParams.CommonQueryParam;
-import com.kym.entity.admin.vo.AdminUserRoleVo;
-import com.kym.entity.admin.vo.AdminUserVo;
-import com.kym.service.admin.AdminUserService;
-import com.kym.service.admin.RoleService;
+import com.kym.entity.queryParams.CommonQueryParam;
+import com.kym.entity.vo.AdminUserRoleVo;
+import com.kym.entity.vo.AdminUserVo;
+import com.kym.service.AdminUserService;
+import com.kym.service.RoleService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;

car-wash-admin/src/main/java/com/kym/admin/controller/BannerController.java

@@ -2,9 +2,9 @@ package com.kym.admin.controller;
 
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
-import com.kym.entity.admin.Banner;
-import com.kym.entity.admin.queryParams.BannerQueryParam;
-import com.kym.service.admin.BannerService;
+import com.kym.entity.Banner;
+import com.kym.entity.queryParams.BannerQueryParam;
+import com.kym.service.BannerService;
 import org.springframework.web.bind.annotation.*;
 
 /**

car-wash-admin/src/main/java/com/kym/admin/controller/CustomController.java

@@ -3,9 +3,9 @@ package com.kym.admin.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
-import com.kym.entity.admin.queryParams.CommonQueryParam;
-import com.kym.service.miniapp.PayLogService;
-import com.kym.service.miniapp.UserService;
+import com.kym.entity.queryParams.CommonQueryParam;
+import com.kym.service.PayLogService;
+import com.kym.service.UserService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;

car-wash-admin/src/main/java/com/kym/admin/controller/DataDictController.java

@@ -3,8 +3,8 @@ package com.kym.admin.controller;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.common.controller.IController;
-import com.kym.entity.miniapp.DataDict;
-import com.kym.service.miniapp.DataDictService;
+import com.kym.entity.DataDict;
+import com.kym.service.DataDictService;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

car-wash-admin/src/main/java/com/kym/admin/controller/DeviceConfigController.java

@@ -0,0 +1,18 @@
+package com.kym.admin.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 洗车设备参数配置表 前端控制器
+ * </p>
+ *
+ * @author skyline
+ * @since 2025-01-19
+ */
+@RestController
+@RequestMapping("/device-config")
+public class DeviceConfigController {
+
+}

car-wash-admin/src/main/java/com/kym/admin/controller/FaqController.java

@@ -4,9 +4,9 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.common.controller.IController;
-import com.kym.entity.admin.Faq;
-import com.kym.entity.admin.queryParams.FaqQueryParam;
-import com.kym.service.admin.FaqService;
+import com.kym.entity.Faq;
+import com.kym.entity.queryParams.FaqQueryParam;
+import com.kym.service.FaqService;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.GetMapping;

car-wash-admin/src/main/java/com/kym/admin/controller/FeedbackController.java

@@ -4,9 +4,9 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.common.controller.IController;
-import com.kym.entity.admin.Feedback;
-import com.kym.entity.admin.queryParams.FeedbackQueryParam;
-import com.kym.service.admin.FeedbackService;
+import com.kym.entity.Feedback;
+import com.kym.entity.queryParams.FeedbackQueryParam;
+import com.kym.service.FeedbackService;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.GetMapping;

car-wash-admin/src/main/java/com/kym/admin/controller/FileController.java

@@ -5,7 +5,7 @@ import com.kym.common.R;
 import com.kym.common.annotation.ApiLog;
 import com.kym.common.controller.IController;
 import com.kym.common.utils.CommUtil;
-import com.kym.service.miniapp.AttachmentService;
+import com.kym.service.AttachmentService;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;

car-wash-admin/src/main/java/com/kym/admin/controller/InvestorInfoController.java

@@ -3,9 +3,9 @@ package com.kym.admin.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.kym.common.R;
 import com.kym.common.utils.CommUtil;
-import com.kym.entity.admin.InvestorInfo;
-import com.kym.entity.admin.queryParams.CommonQueryParam;
-import com.kym.service.admin.InvestorInfoService;
+import com.kym.entity.InvestorInfo;
+import com.kym.entity.queryParams.CommonQueryParam;
+import com.kym.service.InvestorInfoService;
 import com.kym.service.cache.KymCache;
 import org.springframework.web.bind.annotation.*;
 

car-wash-admin/src/main/java/com/kym/admin/controller/PermissionController.java

@@ -1,7 +1,7 @@
 package com.kym.admin.controller;
 
 import com.kym.common.R;
-import com.kym.service.admin.PermissionService;
+import com.kym.service.PermissionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

car-wash-admin/src/main/java/com/kym/admin/controller/RoleController.java

@@ -3,8 +3,8 @@ package com.kym.admin.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.kym.common.R;
 import com.kym.common.controller.IController;
-import com.kym.entity.admin.Role;
-import com.kym.service.admin.RoleService;
+import com.kym.entity.Role;
+import com.kym.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

car-wash-admin/src/main/java/com/kym/admin/controller/SystemNoticeController.java

@@ -1,9 +1,9 @@
 package com.kym.admin.controller;
 
 import com.kym.common.R;
-import com.kym.entity.admin.queryParams.NoticeQueryParams;
-import com.kym.entity.admin.vo.NoticeStationVo;
-import com.kym.service.admin.SystemNoticeService;
+import com.kym.entity.queryParams.NoticeQueryParams;
+import com.kym.entity.vo.NoticeStationVo;
+import com.kym.service.SystemNoticeService;
 import org.springframework.web.bind.annotation.*;
 
 /**

car-wash-admin/src/main/java/com/kym/admin/controller/WashDeviceController.java

@@ -1,22 +1,17 @@
 package com.kym.admin.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
-import com.kym.entity.miniapp.WashDevice;
-import com.kym.entity.miniapp.WashStation;
-import com.kym.entity.miniapp.queryParams.DeviceQueryParams;
-import com.kym.entity.miniapp.queryParams.StationQueryParams;
-import com.kym.service.miniapp.WashDeviceService;
-import com.kym.service.miniapp.WashStationService;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.kym.entity.WashDevice;
+import com.kym.entity.WashStation;
+import com.kym.entity.queryParams.DeviceQueryParams;
+import com.kym.service.WashDeviceService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**

car-wash-admin/src/main/java/com/kym/admin/controller/WashOrderController.java

@@ -4,12 +4,10 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.common.controller.IController;
-import com.kym.entity.common.PageParams;
-import com.kym.entity.miniapp.WashDevice;
-import com.kym.entity.miniapp.queryParams.WashOrderQueryParams;
-import com.kym.service.miniapp.WashOrderService;
+import com.kym.entity.WashDevice;
+import com.kym.entity.queryParams.WashOrderQueryParams;
+import com.kym.service.WashOrderService;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

car-wash-admin/src/main/java/com/kym/admin/controller/WashStationController.java

@@ -3,9 +3,9 @@ package com.kym.admin.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
-import com.kym.entity.miniapp.WashStation;
-import com.kym.entity.miniapp.queryParams.StationQueryParams;
-import com.kym.service.miniapp.WashStationService;
+import com.kym.entity.WashStation;
+import com.kym.entity.queryParams.StationQueryParams;
+import com.kym.service.WashStationService;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 

car-wash-admin/src/main/resources/application.yml

@@ -18,8 +18,8 @@ pagehelper:
   reasonable: false
   defaultCount: true # 分页插件默认参数支持 default-count 形式，自定义扩展的参数，必须大小写一致
 mybatis-plus:
-  mapper-locations: classpath:mappers/**/*.xml
-  type-aliases-package: com.kym.entity.admin
+  mapper-locations: classpath:mappers/*.xml
+  type-aliases-package: com.kym.entity
 
 sa-token:
   # jwt秘钥

car-wash-admin/src/test/java/SpringTestCase.java

@@ -1,4 +1,4 @@
-import com.kym.service.admin.ActivityService;
+import com.kym.service.ActivityService;
 import jakarta.annotation.Resource;
 
 

car-wash-entity/src/main/java/com/kym/entity/miniapp/Account.java → car-wash-entity/src/main/java/com/kym/entity/Account.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/Activity.java → car-wash-entity/src/main/java/com/kym/entity/Activity.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author skyline
@@ -51,7 +51,7 @@ public class Activity extends BaseEntity {
      * 活动描述
      */
     private String activityDesc;
-    
+
     /**
      * 活动描述页面
      */

car-wash-entity/src/main/java/com/kym/entity/admin/ActivityStation.java → car-wash-entity/src/main/java/com/kym/entity/ActivityStation.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/AdminUser.java → car-wash-entity/src/main/java/com/kym/entity/AdminUser.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

car-wash-entity/src/main/java/com/kym/entity/admin/AdminUserRole.java → car-wash-entity/src/main/java/com/kym/entity/AdminUserRole.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/AdminUserStation.java → car-wash-entity/src/main/java/com/kym/entity/AdminUserStation.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/AppLog.java → car-wash-entity/src/main/java/com/kym/entity/AppLog.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/Attachment.java → car-wash-entity/src/main/java/com/kym/entity/Attachment.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

car-wash-entity/src/main/java/com/kym/entity/admin/Banner.java → car-wash-entity/src/main/java/com/kym/entity/Banner.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

car-wash-entity/src/main/java/com/kym/entity/miniapp/Cars.java → car-wash-entity/src/main/java/com/kym/entity/Cars.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;

car-wash-entity/src/main/java/com/kym/entity/miniapp/Collect.java → car-wash-entity/src/main/java/com/kym/entity/Collect.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/Company.java → car-wash-entity/src/main/java/com/kym/entity/Company.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/Contact.java → car-wash-entity/src/main/java/com/kym/entity/Contact.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;
@@ -8,7 +8,7 @@ import lombok.Setter;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author skyline

car-wash-entity/src/main/java/com/kym/entity/admin/Coupon.java → car-wash-entity/src/main/java/com/kym/entity/Coupon.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

car-wash-entity/src/main/java/com/kym/entity/miniapp/DataDict.java → car-wash-entity/src/main/java/com/kym/entity/DataDict.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/DeviceConfig.java

@@ -0,0 +1,288 @@
+package com.kym.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.kym.entity.BaseEntity;
+import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 洗车设备参数配置表
+ * </p>
+ *
+ * @author skyline
+ * @since 2025-01-19
+ */
+@Getter
+@Setter
+@TableName("t_device_config")
+public class DeviceConfig extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 屏幕左下方文本
+     */
+    private String userMessage1;
+
+    /**
+     * 屏幕右下方文本
+     */
+    private String userMessage2;
+
+    /**
+     * 清水单价（分/分钟）
+     */
+    private Integer waterPrice;
+
+    /**
+     * 泡沫单价（分/分钟）
+     */
+    private Integer foamPrice;
+
+    /**
+     * 吸尘单价（分/分钟）
+     */
+    private Integer cleanerPrice;
+
+    /**
+     * 洗手单价（分/分钟）
+     */
+    private Integer tapPrice;
+
+    /**
+     * 消毒单价（分/分钟）
+     */
+    private Integer userExtPrice;
+
+    /**
+     * 最高消费(预付金额，分)
+     */
+    private Integer prepayMoney;
+
+    /**
+     * 工作指示灯(室内照明)关闭延时，30表示洗车结束关机后延时30秒关闭工作指示灯，0表示立刻关闭指示灯
+     */
+    private Integer workLightDelay;
+
+    /**
+     * 水龙头自动关闭延时，30表示打开水龙头后30秒自动关闭水龙头，0表示不允许自动关闭水龙头
+     */
+    private Integer tapOnDelay;
+
+    /**
+     * 空闲超时关，1200表示20分钟不操作机器自动结束订单，用户操作一次就重新开始倒计时一下
+     */
+    private Integer idleTimeout;
+
+    /**
+     * 空闲超时提示音倒计时，60表示当空闲超时倒计时不足60秒的时候发出提示音，提示用户按任意功能键阻止设备关闭
+     */
+    private Integer noticeThresholdIdle;
+
+    /**
+     * 操作超时关机，3600表示每次开机后有60分钟的操作时间，60分钟到了会强制结束订单。
+     */
+    private Integer operationTimeout;
+
+    /**
+     * 操作超时提示音倒计时，300表示当剩余操作时间不足5分钟的时候发出提示音，提示用户合理安排剩余时间
+     */
+    private Integer noticeThresholdOperation;
+
+    /**
+     * 启动延时，电机每次启动最少要开多少毫秒
+     */
+    private Integer motorOnDelay;
+
+    /**
+     * 关闭延时，电机每次关闭最少要关闭多少毫秒
+     */
+    private Integer motorOffDelay;
+
+    /**
+     * 关闭灵敏度，多久收不到流量信号就关闭电机
+     */
+    private Integer motorOnInterval;
+
+    /**
+     * 自动启动，有流量的时候是否自动启动水泵，推荐关闭
+     */
+    private Integer motorFlowOn;
+
+    /**
+     * 自动关闭，没有流量的时候是否自动关闭水泵，推荐开启
+     */
+    private Integer motorFlowOff;
+
+    /**
+     * 工作模式 0：全天暂停营业 1:全天营业 2:根据时间段开始营业
+     */
+    private Integer workMode;
+
+    /**
+     * 时间段1："08:00 - 12:00" 上午8点到中午12点营业
+     */
+    private String workTimePeriod1;
+
+    /**
+     * 时间段2："14:00 - 21:00" 下午2点到晚上9点营业
+     */
+    private String workTimePeriod2;
+
+    /**
+     * 灯光工作模式 0：全天暂停营业 1:全天营业 2:根据时间段开始营业
+     */
+    private Integer lightMode;
+
+    /**
+     * 时间段1："18:00 - 22:00" 下午6点到晚上10点打开照明
+     */
+    private String lightTimePeriod1;
+
+    /**
+     * 时间段2："18:00 - 08:00" 下午6点到早上8点打开照明
+     */
+    private String lightTimePeriod2;
+
+    /**
+     * 按键开机提示音
+     */
+    private String ttsOpenByButton;
+
+    /**
+     * 网络开机提示音
+     */
+    private String ttsOpenByNetwork;
+
+    /**
+     * 按键关机
+     */
+    private String ttsCloseByButton;
+
+    /**
+     * 网络关机
+     */
+    private String ttsCloseByNetwork;
+
+    /**
+     * 空闲超时关机
+     */
+    private String ttsCloseByIdleTimeout;
+
+    /**
+     * 操作超时关机
+     */
+    private String ttsCloseByOperationTimeout;
+
+    /**
+     * 余额不足关机
+     */
+    private String ttsCloseByNoBalance;
+
+    /**
+     * 系统错误关机
+     */
+    private String ttsCloseBySysError;
+
+    /**
+     * 打开清水提示音
+     */
+    private String ttsWaterOn;
+
+    /**
+     * 关闭清水提示音
+     */
+    private String ttsWaterOff;
+
+    /**
+     * 打开泡沫提示音
+     */
+    private String ttsFoamOn;
+
+    /**
+     * 关闭泡沫提示音
+     */
+    private String ttsFoamOff;
+
+    /**
+     * 打开吸尘器提示音
+     */
+    private String ttsCleanerOn;
+
+    /**
+     * 关闭吸尘器提示音
+     */
+    private String ttsCleanerOff;
+
+    /**
+     * 打开水龙头提示音
+     */
+    private String ttsTapOn;
+
+    /**
+     * 关闭水龙头提示音
+     */
+    private String ttsTapOff;
+
+    /**
+     * 打开消毒提示音
+     */
+    private String ttsUserExtOn;
+
+    /**
+     * 关闭消毒提示音
+     */
+    private String ttsUserExtOff;
+
+    /**
+     * 系统启动提示音音
+     */
+    private String ttsAlertSysBoot;
+
+    /**
+     * 空闲模式提示音
+     */
+    private String ttsAlertIdleMode;
+
+    /**
+     * 非营业时间段提示音
+     */
+    private String ttsAlertSleepMode;
+
+    /**
+     * 配置查看模式提示音
+     */
+    private String ttsAlertConfigMode;
+
+    /**
+     * 维护模式提示音
+     */
+    private String ttsAlertMaintenanceMode;
+
+    /**
+     * 没有水的时候提示音
+     */
+    private String ttsAlertNoWater;
+
+    /**
+     * 没有泡沫时的时候提示音
+     */
+    private String ttsAlertNoFoam;
+
+    /**
+     * 电机热保护提示音
+     */
+    private String ttsAlertMotorError;
+
+    /**
+     * 空闲超时关机前的提示音
+     */
+    private String ttsAlertIdleRemainTime;
+
+    /**
+     * 操作超时关机前的提示音
+     */
+    private String ttsAlertOperationRemainTime;
+}

car-wash-entity/src/main/java/com/kym/entity/miniapp/DeviceRelation.java → car-wash-entity/src/main/java/com/kym/entity/DeviceRelation.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;
@@ -8,7 +8,7 @@ import lombok.Setter;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author skyline

car-wash-entity/src/main/java/com/kym/entity/admin/Faq.java → car-wash-entity/src/main/java/com/kym/entity/Faq.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/Feedback.java → car-wash-entity/src/main/java/com/kym/entity/Feedback.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/InvestorInfo.java → car-wash-entity/src/main/java/com/kym/entity/InvestorInfo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/MonitorLog.java → car-wash-entity/src/main/java/com/kym/entity/MonitorLog.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/MpMsgTemplate.java → car-wash-entity/src/main/java/com/kym/entity/MpMsgTemplate.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/MpRelation.java → car-wash-entity/src/main/java/com/kym/entity/MpRelation.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/OrderCoupon.java → car-wash-entity/src/main/java/com/kym/entity/OrderCoupon.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/OrderRechargeRights.java → car-wash-entity/src/main/java/com/kym/entity/OrderRechargeRights.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/PayLog.java → car-wash-entity/src/main/java/com/kym/entity/PayLog.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

car-wash-entity/src/main/java/com/kym/entity/admin/Permission.java → car-wash-entity/src/main/java/com/kym/entity/Permission.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/QuestionAnswer.java → car-wash-entity/src/main/java/com/kym/entity/QuestionAnswer.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/RechargeConfig.java → car-wash-entity/src/main/java/com/kym/entity/RechargeConfig.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/RechargeRights.java → car-wash-entity/src/main/java/com/kym/entity/RechargeRights.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

car-wash-entity/src/main/java/com/kym/entity/miniapp/RefundLog.java → car-wash-entity/src/main/java/com/kym/entity/RefundLog.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/Role.java → car-wash-entity/src/main/java/com/kym/entity/Role.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/RolePermission.java → car-wash-entity/src/main/java/com/kym/entity/RolePermission.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/Statements.java → car-wash-entity/src/main/java/com/kym/entity/Statements.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/StationNotice.java → car-wash-entity/src/main/java/com/kym/entity/StationNotice.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/SystemLog.java → car-wash-entity/src/main/java/com/kym/entity/SystemLog.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/SystemNotice.java → car-wash-entity/src/main/java/com/kym/entity/SystemNotice.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/User.java → car-wash-entity/src/main/java/com/kym/entity/User.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;

car-wash-entity/src/main/java/com/kym/entity/miniapp/UserCoupon.java → car-wash-entity/src/main/java/com/kym/entity/UserCoupon.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

car-wash-entity/src/main/java/com/kym/entity/miniapp/UserRechargeRights.java → car-wash-entity/src/main/java/com/kym/entity/UserRechargeRights.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

car-wash-entity/src/main/java/com/kym/entity/miniapp/UserStation.java → car-wash-entity/src/main/java/com/kym/entity/UserStation.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/WalletDetail.java → car-wash-entity/src/main/java/com/kym/entity/WalletDetail.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

car-wash-entity/src/main/java/com/kym/entity/miniapp/WashDevice.java → car-wash-entity/src/main/java/com/kym/entity/WashDevice.java

@@ -1,9 +1,7 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,15 +18,13 @@ import lombok.Setter;
 @TableName("t_wash_device")
 public class WashDevice extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
-
     public static final String STATE_初始化 = "init";
     public static final String STATE_空闲 = "idle";
     public static final String STATE_忙碌 = "busy";
     public static final String STATE_不在营业时间 = "sleep";
     public static final String STATE_维护 = "maintenance";
     public static final String STATE_故障 = "fault";
-
+    private static final long serialVersionUID = 1L;
     private String stationId;
 
     /**
@@ -80,4 +76,9 @@ public class WashDevice extends BaseEntity {
      * 板载温度传感器的温度值
      */
     private Integer temperatureChip;
+
+    /**
+     * 设备参数配置
+     */
+    private String deviceConfig;
 }

car-wash-entity/src/main/java/com/kym/entity/miniapp/WashOrder.java → car-wash-entity/src/main/java/com/kym/entity/WashOrder.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -11,6 +11,7 @@ import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 
 /**
@@ -110,41 +111,6 @@ public class WashOrder extends BaseEntity {
      */
     private Integer discountMoney;
 
-    /**
-     * 投币的累计金额(仅限刷卡订单,单位分)
-     */
-    private Integer coinMoney;
-
-    /**
-     * 投币的次数仅限刷卡订单
-     */
-    private Integer coinNum;
-
-    /**
-     * 卡类型(仅限刷卡订单,1表示普通卡，2表示储值卡)
-     */
-    private Integer cardType;
-
-    /**
-     * 卡内码，卡出厂的时候厂家写入的ID(仅限刷卡订单)
-     */
-    private String cardId;
-
-    /**
-     * 卡串号，印刷在卡的表面，通过电脑上的卡管理工具写入卡内。(仅限刷卡订单)
-     */
-    private String cardSn;
-
-    /**
-     * 卡过期时间，从1970年开始的时间戳(仅限刷储值卡的订单有效，普通卡为总是为0)
-     */
-    private LocalDateTime cardExpired;
-
-    /**
-     * 卡内余额(仅限刷储值卡的订单有效，普通卡为总是为0)
-     */
-    private Integer cardBalance;
-
     /**
      * 订单操作剩余操作时间(单位秒)，开机后从operation_timeout开始每秒减1，减到0关机，关机原因close_type=operation_timeout
      */
@@ -173,6 +139,11 @@ public class WashOrder extends BaseEntity {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
+    /**
+     * 洗车总时长（秒）
+     */
+    private Integer totalSeconds;
+
     /**
      * 优惠方式：RechargeRights-充值权益 Coupon-优惠券
      */

car-wash-entity/src/main/java/com/kym/entity/miniapp/WashStation.java → car-wash-entity/src/main/java/com/kym/entity/WashStation.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp;
+package com.kym.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/delay/DelayActivity.java → car-wash-entity/src/main/java/com/kym/entity/delay/DelayActivity.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.delay;
+package com.kym.entity.delay;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;

car-wash-entity/src/main/java/com/kym/entity/miniapp/delay/DelayChargeOrder.java → car-wash-entity/src/main/java/com/kym/entity/delay/DelayChargeOrder.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.delay;
+package com.kym.entity.delay;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;

car-wash-entity/src/main/java/com/kym/entity/miniapp/other/DiscountCompute.java → car-wash-entity/src/main/java/com/kym/entity/other/DiscountCompute.java

@@ -1,7 +1,7 @@
-package com.kym.entity.miniapp.other;
+package com.kym.entity.other;
 
-import com.kym.entity.miniapp.Account;
-import com.kym.entity.miniapp.WashOrder;
+import com.kym.entity.Account;
+import com.kym.entity.WashOrder;
 import lombok.Data;
 
 import java.time.LocalDateTime;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/ActivityQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/ActivityQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.common.PageParams;

car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/ApplyInvoiceParams.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/ApplyInvoiceParams.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.queryParams;
+package com.kym.entity.queryParams;
 
 import lombok.Data;
 

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/BannerQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/BannerQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.common.PageParams;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/CommonQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/CommonQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/CouponQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/CouponQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.common.PageParams;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/CustomChargeOrdersQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/CustomChargeOrdersQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/DeviceQueryParams.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/DeviceQueryParams.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.AllArgsConstructor;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/EquipmentQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/EquipmentQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/FaqQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/FaqQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/FeedbackQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/FeedbackQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/InvoiceDetailQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/InvoiceDetailQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/InvoiceQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/InvoiceQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/NoticeQueryParams.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/NoticeQueryParams.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/OrderQueryParams.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/OrderQueryParams.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/RightsQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/RightsQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.common.PageParams;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/StatQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/StatQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/StatementsQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/StatementsQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/queryParams/StationQueryParam.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/StationQueryParam.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/StationQueryParams.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/StationQueryParams.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/WashOrderQueryParams.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/WashOrderQueryParams.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.queryParams;
+package com.kym.entity.queryParams;
 
 import com.kym.entity.common.PageParams;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/WxLoginParams.java → car-wash-entity/src/main/java/com/kym/entity/queryParams/WxLoginParams.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.queryParams;
+package com.kym.entity.queryParams;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/vo/ActivityVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/ActivityVo.java

@@ -1,10 +1,10 @@
-package com.kym.entity.admin.vo;
+package com.kym.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.BaseEntity;
-import com.kym.entity.admin.Banner;
-import com.kym.entity.admin.Coupon;
-import com.kym.entity.admin.RechargeRights;
+import com.kym.entity.Banner;
+import com.kym.entity.Coupon;
+import com.kym.entity.RechargeRights;
 import lombok.Data;
 
 import java.time.LocalDateTime;

car-wash-entity/src/main/java/com/kym/entity/admin/vo/AdminUserRoleVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/AdminUserRoleVo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.vo;
+package com.kym.entity.vo;
 
 import lombok.Data;
 

car-wash-entity/src/main/java/com/kym/entity/admin/vo/AdminUserVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/AdminUserVo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.vo;
+package com.kym.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/miniapp/vo/ChargeOrderVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/ChargeOrderVo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.vo;
+package com.kym.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/miniapp/vo/CollectVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/CollectVo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.vo;/**
+package com.kym.entity.vo;/**
  * @description
  * @author skyline
  * @date 2023-08-14 14:08

car-wash-entity/src/main/java/com/kym/entity/admin/vo/ConnectorInfoVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/ConnectorInfoVo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.vo;
+package com.kym.entity.vo;
 
 import com.kym.entity.BaseEntity;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/vo/ConnectorVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/ConnectorVo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.vo;
+package com.kym.entity.vo;
 
 import lombok.Getter;
 import lombok.Setter;

car-wash-entity/src/main/java/com/kym/entity/admin/vo/CouponVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/CouponVo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.vo;
+package com.kym.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.BaseEntity;

car-wash-entity/src/main/java/com/kym/entity/admin/vo/CustomOrderVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/CustomOrderVo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.vo;
+package com.kym.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

car-wash-entity/src/main/java/com/kym/entity/admin/vo/CustomRechargeVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/CustomRechargeVo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.vo;
+package com.kym.entity.vo;
 
 import com.alibaba.fastjson2.util.DateUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;

car-wash-entity/src/main/java/com/kym/entity/admin/vo/CustomUserVo.java → car-wash-entity/src/main/java/com/kym/entity/vo/CustomUserVo.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.vo;
+package com.kym.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;