From 7bcf61bdc343ebcffcc0dbedc3278282614b104a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 十一月 2024 11:28:34 +0800
Subject: [PATCH] 修改启动异常和一些基础类

---
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserClickLogMapper.xml                  |    0 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java  |    2 
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserCancellationLogMapper.xml           |    0 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java                        |   27 ++--
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/IAgreementService.java                |    2 
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/AgreementServiceImpl.java        |    2 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java           |   45 -------
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java                        |    3 
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml                     |    0 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java               |    2 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java                   |    2 
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/AgreementMapper.java                   |    2 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java       |    6 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java                      |    2 
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserSignRecordMapper.xml                |    0 
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserAddressMapper.xml                   |    0 
 ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml                                            |   64 ----------
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java               |    7 
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java      |   10 
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AgentApplicationMapper.xml              |    0 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserRoleService.java            |    2 
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml            |    0 
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserCouponMapper.xml                    |    0 
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java                    |    7 
 ruoyi-service/ruoyi-order/pom.xml                                                                     |    5 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java        |   13 +-
 /dev/null                                                                                             |   25 ----
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java               |    2 
 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderGoodMapper.xml                         |    7 +
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java           |    2 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java                 |    1 
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/AgreementController.java           |    2 
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserRoleFallbackFactory.java |    1 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java                  |    2 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java        |    6 
 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml                        |    7 +
 ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml               |    4 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java       |    2 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java    |    6 
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml                       |    0 
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml           |    0 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java        |   31 -----
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserChangeLogMapper.xml                 |    0 
 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml                             |    7 +
 44 files changed, 80 insertions(+), 228 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/model/Agreement.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/model/Agreement.java
deleted file mode 100644
index 84c98da..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/model/Agreement.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.other.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/** 协议
- * @author zhibing.pu
- * @Date 2024/11/21 10:44
- */
-@Data
-@TableName("t_agreement")
-public class Agreement {
-	/**
-	 * 主键
-	 */
-	@TableId(value = "id", type = IdType.AUTO)
-	private Integer id;
-	/**
-	 * 类型（1=用户协议，2=隐私协议，3=技师上门免责声明，4=注销协议，5门店提现免责声明）
-	 */
-	@TableField("type")
-	private Integer type;
-	/**
-	 * 协议内容
-	 */
-	@TableField("content")
-	private String content;
-	/**
-	 * 添加时间
-	 */
-	@TableField("create_time")
-	private LocalDateTime createTime;
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserRoleFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserRoleFallbackFactory.java
index a06b625..f962743 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserRoleFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserRoleFallbackFactory.java
@@ -2,6 +2,7 @@
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.feignClient.SysUserRoleClient;
+import com.ruoyi.system.api.model.SysUserRoleVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/GenTable.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/GenTable.java
deleted file mode 100644
index 62a3c3d..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/GenTable.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("gen_table")
-@ApiModel(value="GenTable对象", description="")
-public class GenTable implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    @TableId(value = "table_id", type = IdType.AUTO)
-    private Long tableId;
-
-    @ApiModelProperty(value = "表名称")
-    @TableField("table_name")
-    private String tableName;
-
-    @ApiModelProperty(value = "表描述")
-    @TableField("table_comment")
-    private String tableComment;
-
-    @ApiModelProperty(value = "关联子表的表名")
-    @TableField("sub_table_name")
-    private String subTableName;
-
-    @ApiModelProperty(value = "子表关联的外键名")
-    @TableField("sub_table_fk_name")
-    private String subTableFkName;
-
-    @ApiModelProperty(value = "实体类名称")
-    @TableField("class_name")
-    private String className;
-
-    @ApiModelProperty(value = "使用的模板（crud单表操作 tree树表操作）")
-    @TableField("tpl_category")
-    private String tplCategory;
-
-    @ApiModelProperty(value = "生成包路径")
-    @TableField("package_name")
-    private String packageName;
-
-    @ApiModelProperty(value = "生成模块名")
-    @TableField("module_name")
-    private String moduleName;
-
-    @ApiModelProperty(value = "生成业务名")
-    @TableField("business_name")
-    private String businessName;
-
-    @ApiModelProperty(value = "生成功能名")
-    @TableField("function_name")
-    private String functionName;
-
-    @ApiModelProperty(value = "生成功能作者")
-    @TableField("function_author")
-    private String functionAuthor;
-
-    @ApiModelProperty(value = "生成代码方式（0zip压缩包 1自定义路径）")
-    @TableField("gen_type")
-    private String genType;
-
-    @ApiModelProperty(value = "生成路径（不填默认项目路径）")
-    @TableField("gen_path")
-    private String genPath;
-
-    @ApiModelProperty(value = "其它生成选项")
-    @TableField("options")
-    private String options;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/GenTableColumn.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/GenTableColumn.java
deleted file mode 100644
index 9526894..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/GenTableColumn.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("gen_table_column")
-@ApiModel(value="GenTableColumn对象", description="")
-public class GenTableColumn implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    @TableId(value = "column_id", type = IdType.AUTO)
-    private Long columnId;
-
-    @ApiModelProperty(value = "归属表编号")
-    @TableField("table_id")
-    private String tableId;
-
-    @ApiModelProperty(value = "列名称")
-    @TableField("column_name")
-    private String columnName;
-
-    @ApiModelProperty(value = "列描述")
-    @TableField("column_comment")
-    private String columnComment;
-
-    @ApiModelProperty(value = "列类型")
-    @TableField("column_type")
-    private String columnType;
-
-    @ApiModelProperty(value = "JAVA类型")
-    @TableField("java_type")
-    private String javaType;
-
-    @ApiModelProperty(value = "JAVA字段名")
-    @TableField("java_field")
-    private String javaField;
-
-    @ApiModelProperty(value = "是否主键（1是）")
-    @TableField("is_pk")
-    private String isPk;
-
-    @ApiModelProperty(value = "是否自增（1是）")
-    @TableField("is_increment")
-    private String isIncrement;
-
-    @ApiModelProperty(value = "是否必填（1是）")
-    @TableField("is_required")
-    private String isRequired;
-
-    @ApiModelProperty(value = "是否为插入字段（1是）")
-    @TableField("is_insert")
-    private String isInsert;
-
-    @ApiModelProperty(value = "是否编辑字段（1是）")
-    @TableField("is_edit")
-    private String isEdit;
-
-    @ApiModelProperty(value = "是否列表字段（1是）")
-    @TableField("is_list")
-    private String isList;
-
-    @ApiModelProperty(value = "是否查询字段（1是）")
-    @TableField("is_query")
-    private String isQuery;
-
-    @ApiModelProperty(value = "查询方式（等于、不等于、大于、小于、范围）")
-    @TableField("query_type")
-    private String queryType;
-
-    @ApiModelProperty(value = "显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）")
-    @TableField("html_type")
-    private String htmlType;
-
-    @ApiModelProperty(value = "字典类型")
-    @TableField("dict_type")
-    private String dictType;
-
-    @ApiModelProperty(value = "排序")
-    @TableField("sort")
-    private Integer sort;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysConfig.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysConfig.java
deleted file mode 100644
index d39d9e2..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysConfig.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_config")
-@ApiModel(value="SysConfig对象", description="")
-public class SysConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数主键")
-    @TableId(value = "config_id", type = IdType.AUTO)
-    private Integer configId;
-
-    @ApiModelProperty(value = "参数名称")
-    @TableField("config_name")
-    private String configName;
-
-    @ApiModelProperty(value = "参数键名")
-    @TableField("config_key")
-    private String configKey;
-
-    @ApiModelProperty(value = "参数键值")
-    @TableField("config_value")
-    private String configValue;
-
-    @ApiModelProperty(value = "系统内置（Y是 N否）")
-    @TableField("config_type")
-    private String configType;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDept.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDept.java
deleted file mode 100644
index a865296..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDept.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_dept")
-@ApiModel(value="SysDept对象", description="")
-public class SysDept implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "部门id")
-    @TableId(value = "dept_id", type = IdType.AUTO)
-    private Long deptId;
-
-    @ApiModelProperty(value = "父部门id")
-    @TableField("parent_id")
-    private Long parentId;
-
-    @ApiModelProperty(value = "祖级列表")
-    @TableField("ancestors")
-    private String ancestors;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField("dept_name")
-    private String deptName;
-
-    @ApiModelProperty(value = "显示顺序")
-    @TableField("order_num")
-    private Integer orderNum;
-
-    @ApiModelProperty(value = "负责人")
-    @TableField("leader")
-    private String leader;
-
-    @ApiModelProperty(value = "联系电话")
-    @TableField("phone")
-    private String phone;
-
-    @ApiModelProperty(value = "邮箱")
-    @TableField("email")
-    private String email;
-
-    @ApiModelProperty(value = "部门状态（0正常 1停用）")
-    @TableField("status")
-    private String status;
-
-    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-    @TableField("del_flag")
-    @TableLogic
-    private String delFlag;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "门店id")
-    @TableField("shop_id")
-    private Integer shopId;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDictData.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDictData.java
deleted file mode 100644
index 6a1c1aa..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDictData.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_dict_data")
-@ApiModel(value="SysDictData对象", description="")
-public class SysDictData implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "字典编码")
-    @TableId(value = "dict_code", type = IdType.AUTO)
-    private Long dictCode;
-
-    @ApiModelProperty(value = "字典排序")
-    @TableField("dict_sort")
-    private Integer dictSort;
-
-    @ApiModelProperty(value = "字典标签")
-    @TableField("dict_label")
-    private String dictLabel;
-
-    @ApiModelProperty(value = "字典键值")
-    @TableField("dict_value")
-    private String dictValue;
-
-    @ApiModelProperty(value = "字典类型")
-    @TableField("dict_type")
-    private String dictType;
-
-    @ApiModelProperty(value = "样式属性（其他样式扩展）")
-    @TableField("css_class")
-    private String cssClass;
-
-    @ApiModelProperty(value = "表格回显样式")
-    @TableField("list_class")
-    private String listClass;
-
-    @ApiModelProperty(value = "是否默认（Y是 N否）")
-    @TableField("is_default")
-    private String isDefault;
-
-    @ApiModelProperty(value = "状态（0正常 1停用）")
-    @TableField("status")
-    private String status;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDictType.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDictType.java
deleted file mode 100644
index 4783c3f..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDictType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_dict_type")
-@ApiModel(value="SysDictType对象", description="")
-public class SysDictType implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "字典主键")
-    @TableId(value = "dict_id", type = IdType.AUTO)
-    private Long dictId;
-
-    @ApiModelProperty(value = "字典名称")
-    @TableField("dict_name")
-    private String dictName;
-
-    @ApiModelProperty(value = "字典类型")
-    @TableField("dict_type")
-    private String dictType;
-
-    @ApiModelProperty(value = "状态（0正常 1停用）")
-    @TableField("status")
-    private String status;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysJob.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysJob.java
deleted file mode 100644
index f9b562c..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysJob.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_job")
-@ApiModel(value="SysJob对象", description="")
-public class SysJob implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "任务ID")
-    @TableId(value = "job_id", type = IdType.AUTO)
-    private Long jobId;
-
-    @ApiModelProperty(value = "任务名称")
-    @TableField("job_name")
-    private String jobName;
-
-    @ApiModelProperty(value = "任务组名")
-    @TableField("job_group")
-    private String jobGroup;
-
-    @ApiModelProperty(value = "调用目标字符串")
-    @TableField("invoke_target")
-    private String invokeTarget;
-
-    @ApiModelProperty(value = "cron执行表达式")
-    @TableField("cron_expression")
-    private String cronExpression;
-
-    @ApiModelProperty(value = "计划执行错误策略（1立即执行 2执行一次 3放弃执行）")
-    @TableField("misfire_policy")
-    private String misfirePolicy;
-
-    @ApiModelProperty(value = "是否并发执行（0允许 1禁止）")
-    @TableField("concurrent")
-    private String concurrent;
-
-    @ApiModelProperty(value = "状态（0正常 1暂停）")
-    @TableField("status")
-    private String status;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "备注信息")
-    @TableField("remark")
-    private String remark;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysJobLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysJobLog.java
deleted file mode 100644
index 4094a55..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysJobLog.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_job_log")
-@ApiModel(value="SysJobLog对象", description="")
-public class SysJobLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "任务日志ID")
-    @TableId(value = "job_log_id", type = IdType.AUTO)
-    private Long jobLogId;
-
-    @ApiModelProperty(value = "任务名称")
-    @TableField("job_name")
-    private String jobName;
-
-    @ApiModelProperty(value = "任务组名")
-    @TableField("job_group")
-    private String jobGroup;
-
-    @ApiModelProperty(value = "调用目标字符串")
-    @TableField("invoke_target")
-    private String invokeTarget;
-
-    @ApiModelProperty(value = "日志信息")
-    @TableField("job_message")
-    private String jobMessage;
-
-    @ApiModelProperty(value = "执行状态（0正常 1失败）")
-    @TableField("status")
-    private String status;
-
-    @ApiModelProperty(value = "异常信息")
-    @TableField("exception_info")
-    private String exceptionInfo;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysLoginLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysLoginLog.java
deleted file mode 100644
index 88ec399..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysLoginLog.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_login_log")
-@ApiModel(value="SysLoginLog对象", description="")
-public class SysLoginLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户id")
-    @TableField("user_id")
-    private Integer userId;
-
-    @ApiModelProperty(value = "登录账号")
-    @TableField("username")
-    private String username;
-
-    @ApiModelProperty(value = "登录IP地址")
-    @TableField("ip_address")
-    private String ipAddress;
-
-    @ApiModelProperty(value = "登录地址")
-    @TableField("address")
-    private String address;
-
-    @ApiModelProperty(value = "浏览器类型")
-    @TableField("browser_type")
-    private String browserType;
-
-    @ApiModelProperty(value = "操作系统")
-    @TableField("operating_system")
-    private String operatingSystem;
-
-    @ApiModelProperty(value = "登录时间")
-    @TableField("login_time")
-    private LocalDateTime loginTime;
-
-    @ApiModelProperty(value = "登录状态（1=成功，2=失败）")
-    @TableField("login_status")
-    private Integer loginStatus;
-
-    @ApiModelProperty(value = "提示消息")
-    @TableField("message")
-    private String message;
-
-    @ApiModelProperty(value = "添加时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "删除状态（0=否，1=是）")
-    @TableField("del_flag")
-    @TableLogic
-    private Integer delFlag;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysMenu.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysMenu.java
deleted file mode 100644
index adc759f..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysMenu.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_menu")
-@ApiModel(value="SysMenu对象", description="")
-public class SysMenu implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "菜单ID")
-    @TableId(value = "menu_id", type = IdType.AUTO)
-    private Long menuId;
-
-    @ApiModelProperty(value = "菜单名称")
-    @TableField("menu_name")
-    private String menuName;
-
-    @ApiModelProperty(value = "父菜单ID")
-    @TableField("parent_id")
-    private Long parentId;
-
-    @ApiModelProperty(value = "显示顺序")
-    @TableField("order_num")
-    private Integer orderNum;
-
-    @ApiModelProperty(value = "路由地址")
-    @TableField("path")
-    private String path;
-
-    @ApiModelProperty(value = "组件路径")
-    @TableField("component")
-    private String component;
-
-    @ApiModelProperty(value = "路由参数")
-    @TableField("query")
-    private String query;
-
-    @ApiModelProperty(value = "是否为外链（0是 1否）")
-    @TableField("is_frame")
-    private Integer isFrame;
-
-    @ApiModelProperty(value = "是否缓存（0缓存 1不缓存）")
-    @TableField("is_cache")
-    private Integer isCache;
-
-    @ApiModelProperty(value = "菜单类型（M目录 C菜单 F按钮）")
-    @TableField("menu_type")
-    private String menuType;
-
-    @ApiModelProperty(value = "菜单状态（0显示 1隐藏）")
-    @TableField("visible")
-    private String visible;
-
-    @ApiModelProperty(value = "菜单状态（0正常 1停用）")
-    @TableField("status")
-    private Boolean status;
-
-    @ApiModelProperty(value = "权限标识")
-    @TableField("perms")
-    private String perms;
-
-    @ApiModelProperty(value = "菜单图标")
-    @TableField("icon")
-    private String icon;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysNotice.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysNotice.java
deleted file mode 100644
index 75deb90..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysNotice.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.sql.Blob;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_notice")
-@ApiModel(value="SysNotice对象", description="")
-public class SysNotice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "公告ID")
-    @TableId(value = "notice_id", type = IdType.AUTO)
-    private Integer noticeId;
-
-    @ApiModelProperty(value = "公告标题")
-    @TableField("notice_title")
-    private String noticeTitle;
-
-    @ApiModelProperty(value = "公告类型（1通知 2公告）")
-    @TableField("notice_type")
-    private String noticeType;
-
-    @ApiModelProperty(value = "公告内容")
-    @TableField("notice_content")
-    private Blob noticeContent;
-
-    @ApiModelProperty(value = "公告状态（0正常 1关闭）")
-    @TableField("status")
-    private String status;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysOperLog.java
deleted file mode 100644
index 5724ce2..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysOperLog.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_oper_log")
-@ApiModel(value="SysOperLog对象", description="")
-public class SysOperLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "日志主键")
-    @TableId(value = "oper_id", type = IdType.AUTO)
-    private Long operId;
-
-    @ApiModelProperty(value = "模块标题")
-    @TableField("title")
-    private String title;
-
-    @ApiModelProperty(value = "业务类型（0其它 1新增 2修改 3删除）")
-    @TableField("business_type")
-    private Integer businessType;
-
-    @ApiModelProperty(value = "方法名称")
-    @TableField("method")
-    private String method;
-
-    @ApiModelProperty(value = "请求方式")
-    @TableField("request_method")
-    private String requestMethod;
-
-    @ApiModelProperty(value = "操作类别（0其它 1后台用户 2手机端用户）")
-    @TableField("operator_type")
-    private Integer operatorType;
-
-    @ApiModelProperty(value = "操作人员")
-    @TableField("oper_name")
-    private String operName;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField("dept_name")
-    private String deptName;
-
-    @ApiModelProperty(value = "请求URL")
-    @TableField("oper_url")
-    private String operUrl;
-
-    @ApiModelProperty(value = "主机地址")
-    @TableField("oper_ip")
-    private String operIp;
-
-    @ApiModelProperty(value = "操作地点")
-    @TableField("oper_location")
-    private String operLocation;
-
-    @ApiModelProperty(value = "请求参数")
-    @TableField("oper_param")
-    private String operParam;
-
-    @ApiModelProperty(value = "返回参数")
-    @TableField("json_result")
-    private String jsonResult;
-
-    @ApiModelProperty(value = "操作状态（0正常 1异常）")
-    @TableField("status")
-    private Integer status;
-
-    @ApiModelProperty(value = "错误消息")
-    @TableField("error_msg")
-    private String errorMsg;
-
-    @ApiModelProperty(value = "操作时间")
-    @TableField("oper_time")
-    private LocalDateTime operTime;
-
-    @ApiModelProperty(value = "消耗时间")
-    @TableField("cost_time")
-    private Long costTime;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysPost.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysPost.java
deleted file mode 100644
index 0231e8b..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysPost.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_post")
-@ApiModel(value="SysPost对象", description="")
-public class SysPost implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "岗位ID")
-    @TableId(value = "post_id", type = IdType.AUTO)
-    private Long postId;
-
-    @ApiModelProperty(value = "岗位编码")
-    @TableField("post_code")
-    private String postCode;
-
-    @ApiModelProperty(value = "岗位名称")
-    @TableField("post_name")
-    private String postName;
-
-    @ApiModelProperty(value = "显示顺序")
-    @TableField("post_sort")
-    private Integer postSort;
-
-    @ApiModelProperty(value = "状态（0正常 1停用）")
-    @TableField("status")
-    private String status;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRole.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRole.java
deleted file mode 100644
index dee1a8b..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRole.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_role")
-@ApiModel(value="SysRole对象", description="")
-public class SysRole implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "角色ID")
-    @TableId(value = "role_id", type = IdType.AUTO)
-    private Long roleId;
-
-    @ApiModelProperty(value = "角色名称")
-    @TableField("role_name")
-    private String roleName;
-
-    @ApiModelProperty(value = "角色权限字符串")
-    @TableField("role_key")
-    private String roleKey;
-
-    @ApiModelProperty(value = "数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）")
-    @TableField("data_scope")
-    private String dataScope;
-
-    @ApiModelProperty(value = "角色状态（0正常 1停用）")
-    @TableField("status")
-    private String status;
-
-    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-    @TableField("del_flag")
-    @TableLogic
-    private String delFlag;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-    @ApiModelProperty(value = "门店id")
-    @TableField("shop_id")
-    private Integer shopId;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRoleDept.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRoleDept.java
deleted file mode 100644
index 4632a86..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRoleDept.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_role_dept")
-@ApiModel(value="SysRoleDept对象", description="")
-public class SysRoleDept implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "角色ID")
-    @TableId("role_id")
-    private Long roleId;
-
-    @ApiModelProperty(value = "部门ID")
-    @TableField("dept_id")
-    private Long deptId;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRoleMenu.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRoleMenu.java
deleted file mode 100644
index 521bf13..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysRoleMenu.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_role_menu")
-@ApiModel(value="SysRoleMenu对象", description="")
-public class SysRoleMenu implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "角色ID")
-    @TableId("role_id")
-    private Long roleId;
-
-    @ApiModelProperty(value = "菜单ID")
-    @TableField("menu_id")
-    private Long menuId;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUser.java
deleted file mode 100644
index d45633f..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUser.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_user")
-@ApiModel(value="SysUser对象", description="")
-public class SysUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "用户ID")
-    @TableId(value = "user_id", type = IdType.AUTO)
-    private Long userId;
-
-    @ApiModelProperty(value = "部门ID")
-    @TableField("dept_id")
-    private Long deptId;
-
-    @ApiModelProperty(value = "用户账号")
-    @TableField("user_name")
-    private String userName;
-
-    @ApiModelProperty(value = "用户昵称")
-    @TableField("nick_name")
-    private String nickName;
-
-    @ApiModelProperty(value = "用户类型（00系统用户）")
-    @TableField("user_type")
-    private String userType;
-
-    @ApiModelProperty(value = "用户邮箱")
-    @TableField("email")
-    private String email;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField("phonenumber")
-    private String phonenumber;
-
-    @ApiModelProperty(value = "用户性别（0男 1女 2未知）")
-    @TableField("sex")
-    private String sex;
-
-    @ApiModelProperty(value = "头像地址")
-    @TableField("avatar")
-    private String avatar;
-
-    @ApiModelProperty(value = "密码")
-    @TableField("password")
-    private String password;
-
-    @ApiModelProperty(value = "帐号状态（0正常 1停用）")
-    @TableField("status")
-    private String status;
-
-    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-    @TableField("del_flag")
-    @TableLogic
-    private String delFlag;
-
-    @ApiModelProperty(value = "最后登录IP")
-    @TableField("login_ip")
-    private String loginIp;
-
-    @ApiModelProperty(value = "最后登录时间")
-    @TableField("login_date")
-    private LocalDateTime loginDate;
-
-    @ApiModelProperty(value = "角色类型 1=平台 2=门店")
-    @TableField("roleType")
-    private Integer roleType;
-
-    @ApiModelProperty(value = "密码修改时间")
-    @TableField("passWordUpdate")
-    private LocalDateTime passWordUpdate;
-
-    @ApiModelProperty(value = "对象ID")
-    @TableField("objectId")
-    private Integer objectId;
-
-    @ApiModelProperty(value = "创建者")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-    @ApiModelProperty(value = "禁用账户备注")
-    @TableField("forbidden_remark")
-    private String forbiddenRemark;
-
-    @ApiModelProperty(value = "前端用户id")
-    @TableField("app_user_id")
-    private Integer appUserId;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUserPost.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUserPost.java
deleted file mode 100644
index 8409d8d..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUserPost.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_user_post")
-@ApiModel(value="SysUserPost对象", description="")
-public class SysUserPost implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "用户ID")
-    @TableId("user_id")
-    private Long userId;
-
-    @ApiModelProperty(value = "岗位ID")
-    @TableField("post_id")
-    private Long postId;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUserRole.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUserRole.java
deleted file mode 100644
index cf577e9..0000000
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysUserRole.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.system.api.model;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_user_role")
-@ApiModel(value="SysUserRole对象", description="")
-public class SysUserRole implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "用户ID")
-    @TableId("user_id")
-    private Long userId;
-
-    @ApiModelProperty(value = "角色ID")
-    @TableField("role_id")
-    private Long roleId;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index 3f71e38..cf387cb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -2,8 +2,6 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.chargingPile.api.feignClient.SiteClient;
-import com.ruoyi.chargingPile.api.model.Site;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -14,8 +12,6 @@
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.other.api.domain.TRoleSite;
-import com.ruoyi.other.api.feignClient.RoleSiteClient;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
@@ -72,12 +68,6 @@
 	@Resource
 	private SysMenuMapper menuMapper;
 	
-	@Resource
-	private RoleSiteClient roleSiteClient;
-	
-	@Resource
-	private SiteClient siteClient;
-	
 	
 	@ApiOperation(value = "获取角色列表", tags = {"管理后台-系统用户管理"})
 	@GetMapping("/list")
@@ -99,12 +89,6 @@
 		
 		PageInfo<SysRole> page = roleService.page(pageInfo, wrapper.orderByDesc(SysRole::getCreateTime));
 		for (SysRole record : page.getRecords()) {
-			List<Integer> data = roleSiteClient.getSiteIds(record.getRoleId()).getData();
-			List<Site> sites = siteClient.getSiteByIds(data).getData();
-			if (null != sites) {
-				List<String> collect = sites.stream().map(Site::getName).collect(Collectors.toList());
-				record.setSiteNames(collect);
-			}
 			long count = sysUserRoleService.count(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, record.getRoleId()));
 			record.setNumber(count);
 		}
@@ -134,15 +118,6 @@
 		role.setCreateBy(SecurityUtils.getUsername());
 		role.setCreateTime(new Date());
 		roleService.insertRole(role);
-		//添加站点权限
-		List<TRoleSite> roleSites = new ArrayList<>();
-		for (Integer siteId : dto.getSiteIds()) {
-			TRoleSite roleSite = new TRoleSite();
-			roleSite.setRoleId(role.getRoleId().intValue());
-			roleSite.setSiteId(siteId);
-			roleSites.add(roleSite);
-		}
-		roleSiteClient.addRoleSite(roleSites);
 		return AjaxResult.success();
 	}
 	
@@ -179,13 +154,6 @@
 		}
 		roleInfoVo.setMenus(menusId);
 		roleInfoVo.setRemark(role.getRemark());
-		List<Integer> siteIds = roleSiteClient.getSiteIds(role.getRoleId()).getData();
-		if (null != siteIds && siteIds.size() > 0) {
-			List<Site> sites = siteClient.getSiteByIds(siteIds).getData();
-			List<String> siteNames = sites.stream().map(Site::getName).collect(Collectors.toList());
-			roleInfoVo.setSiteNames(siteNames);
-			roleInfoVo.setSiteIds(siteIds);
-		}
 		return AjaxResult.success(roleInfoVo);
 	}
 	
@@ -229,19 +197,6 @@
 			sysRoleMenus.add(sysRoleMenu);
 		}
 		sysRoleMenuMapper.batchRoleMenu(sysRoleMenus);
-		//删除旧站点数据
-		roleSiteClient.delRoleSite(dto.getRoleId());
-		//添加站点权限
-		List<TRoleSite> roleSites = new ArrayList<>();
-		if(null != dto.getSiteIds()){
-			for (Integer siteId : dto.getSiteIds()) {
-				TRoleSite roleSite = new TRoleSite();
-				roleSite.setRoleId(role.getRoleId().intValue());
-				roleSite.setSiteId(siteId);
-				roleSites.add(roleSite);
-			}
-		}
-		roleSiteClient.addRoleSite(roleSites);
 		return AjaxResult.success();
 	}
 	
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index f6bf757..35c2bcd 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -15,8 +15,8 @@
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.api.model.SysUserRole;
 import com.ruoyi.system.api.query.ChangeUserQuery;
+import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.query.GetSysUserList;
 import com.ruoyi.system.query.ShopUserStart;
 import com.ruoyi.system.service.*;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java
index 7bc4b13..83de774 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java
@@ -8,8 +8,8 @@
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.system.api.model.SysUserRole;
 import com.ruoyi.system.api.model.SysUserRoleVo;
+import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysUserRoleService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java
index ab86abd..c5c1947 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java
@@ -69,7 +69,7 @@
 		//小程序用户
 		if ("applet".equals(userType)) {
 			AppUser appUser = appUserClient.getAppUserById(Long.valueOf(userid));
-			if(null == appUser || 1 == appUser.getDelFlag() || 3 == appUser.getStatus()){
+			if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
 				log.error("[账户异常处理]请求账户id:{}", userid);
 				unauthorizedResponse(response,"无效的账户");
 				return;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GenTableColumnMapper.java
deleted file mode 100644
index 68dafc9..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GenTableColumnMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.system.api.model.GenTableColumn;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-public interface GenTableColumnMapper extends BaseMapper<GenTableColumn> {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GenTableMapper.java
deleted file mode 100644
index b90e801..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GenTableMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.system.api.model.GenTable;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-public interface GenTableMapper extends BaseMapper<GenTable> {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysJobLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysJobLogMapper.java
deleted file mode 100644
index 0bde9e9..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysJobLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.system.api.model.SysJobLog;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysJobMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysJobMapper.java
deleted file mode 100644
index 7d59278..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysJobMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.system.api.model.SysJob;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-public interface SysJobMapper extends BaseMapper<SysJob> {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
index 44cff2c..3b75913 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.system.api.model.SysUserRole;
+import com.ruoyi.system.domain.SysUserRole;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/GenTableColumnService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/GenTableColumnService.java
deleted file mode 100644
index b02927d..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/GenTableColumnService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.api.model.GenTableColumn;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-public interface GenTableColumnService extends IService<GenTableColumn> {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/GenTableService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/GenTableService.java
deleted file mode 100644
index 6087bae..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/GenTableService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.api.model.GenTable;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-public interface GenTableService extends IService<GenTable> {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserRoleService.java
index 2f37851..ad53da0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserRoleService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserRoleService.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.api.model.SysUserRole;
+import com.ruoyi.system.domain.SysUserRole;
 
 import java.util.List;
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GenTableColumnServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GenTableColumnServiceImpl.java
deleted file mode 100644
index 333f3a5..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GenTableColumnServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.GenTableColumnMapper;
-import com.ruoyi.system.api.model.GenTableColumn;
-import com.ruoyi.account.service.GenTableColumnService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Service
-public class GenTableColumnServiceImpl extends ServiceImpl<GenTableColumnMapper, GenTableColumn> implements GenTableColumnService {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GenTableServiceImpl.java
deleted file mode 100644
index 2512958..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GenTableServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.GenTableMapper;
-import com.ruoyi.system.api.model.GenTable;
-import com.ruoyi.account.service.GenTableService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Service
-public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> implements GenTableService {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysJobLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysJobLogServiceImpl.java
deleted file mode 100644
index 5a55eb2..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysJobLogServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.SysJobLogMapper;
-import com.ruoyi.system.api.model.SysJobLog;
-import com.ruoyi.account.service.SysJobLogService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Service
-public class SysJobLogServiceImpl extends ServiceImpl<SysJobLogMapper, SysJobLog> implements SysJobLogService {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysJobServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysJobServiceImpl.java
deleted file mode 100644
index bf14556..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysJobServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.SysJobMapper;
-import com.ruoyi.system.api.model.SysJob;
-import com.ruoyi.account.service.SysJobService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Service
-public class SysJobServiceImpl extends ServiceImpl<SysJobMapper, SysJob> implements SysJobService {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 14c4628..607db4f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -7,14 +7,15 @@
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.model.SysUserRole;
 import com.ruoyi.system.domain.SysMenu;
 import com.ruoyi.system.domain.SysMenus;
+import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.domain.vo.MetaVo;
 import com.ruoyi.system.domain.vo.RouterVo;
 import com.ruoyi.system.domain.vo.TreeSelect;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,19 +32,19 @@
 {
     public static final String PREMISSION_STRING = "perms[\"{0}\"]";
 
-    @Resource
+    @Autowired
     private SysMenuMapper menuMapper;
 
-    @Resource
+    @Autowired
     private SysRoleMapper roleMapper;
 
-    @Resource
+    @Autowired
     private SysRoleMenuMapper roleMenuMapper;
 
-    @Resource
+    @Autowired
     private TokenService tokenService;
 
-    @Resource
+    @Autowired
     private SysUserRoleMapper sysUserRoleMapper;
 
     @Resource
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
index a065e37..099fd79 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
@@ -29,6 +29,7 @@
     /**
      * 获取角色数据权限
      * 
+     * @param userId 用户Id
      * @return 角色权限信息
      */
     @Override
@@ -50,6 +51,7 @@
     /**
      * 获取菜单数据权限
      * 
+     * @param userId 用户Id
      * @return 菜单权限信息
      */
     @Override
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleDeptServiceImpl.java
deleted file mode 100644
index 0225f46..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleDeptServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.SysRoleDeptMapper;
-import com.ruoyi.system.api.model.SysRoleDept;
-import com.ruoyi.account.service.SysRoleDeptService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Service
-public class SysRoleDeptServiceImpl extends ServiceImpl<SysRoleDeptMapper, SysRoleDept> implements SysRoleDeptService {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleMenuServiceImpl.java
deleted file mode 100644
index d4aecd3..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleMenuServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.SysRoleMenuMapper;
-import com.ruoyi.system.api.model.SysRoleMenu;
-import com.ruoyi.account.service.SysRoleMenuService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Service
-public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements SysRoleMenuService {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserPostServiceImpl.java
deleted file mode 100644
index 264bea7..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserPostServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.SysUserPostMapper;
-import com.ruoyi.system.api.model.SysUserPost;
-import com.ruoyi.account.service.SysUserPostService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
- */
-@Service
-public class SysUserPostServiceImpl extends ServiceImpl<SysUserPostMapper, SysUserPost> implements SysUserPostService {
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java
index ec219ad..3f3603f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserRoleServiceImpl.java
@@ -1,12 +1,12 @@
 package com.ruoyi.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.api.model.SysUserRole;
+import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.SysUserRoleMapper;
 import com.ruoyi.system.service.ISysUserRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -17,7 +17,7 @@
  */
 @Service
 public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
-	@Resource
+	@Autowired
 	private SysUserRoleMapper sysUserRoleMapper;
 	
 	/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 064938a..08b41c6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -2,8 +2,6 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.chargingPile.api.feignClient.SiteClient;
-import com.ruoyi.chargingPile.api.model.Site;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.SpringUtils;
@@ -13,8 +11,6 @@
 import com.ruoyi.common.datascope.annotation.DataScope;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.other.api.feignClient.RoleSiteClient;
-import com.ruoyi.other.api.feignClient.UserSiteClient;
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.query.ChangeUserQuery;
@@ -73,15 +69,6 @@
 	
 	@Resource
 	private ISysUserRoleService sysUserRoleService;
-	
-	@Resource
-	private RoleSiteClient roleSiteClient;
-	
-	@Resource
-	private UserSiteClient userSiteClient;
-	
-	@Resource
-	private SiteClient siteClient;
 	
 	@Resource
 	private ISysRoleService sysRoleService;
@@ -525,24 +512,6 @@
 		List<SysUser> list = this.baseMapper.getList(pageInfo, getSysUserList);
 		for (SysUser sysUser : list) {
 			List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
-			List<Integer> data1 = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
-			if (null == data1) {
-				data1 = new ArrayList<>();
-			}
-			for (SysUserRole sysUserRole : list1) {
-				List<Integer> data = roleSiteClient.getSiteIds(sysUserRole.getRoleId()).getData();
-				if (null == data) {
-					continue;
-				}
-				data1.addAll(data);
-			}
-			Set<Integer> siteIds = new HashSet<>(data1);
-			List<Site> data = siteClient.getSiteByIds(siteIds.stream().collect(Collectors.toList())).getData();
-			if (null != data) {
-				List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList());
-				sysUser.setSiteNames(siteNames);
-				sysUser.setSiteIds(data.stream().map(Site::getId).collect(Collectors.toList()));
-			}
 			List<String> roleNames = new ArrayList<>();
 			for (SysUserRole sysUserRole : list1) {
 				SysRole sysRole = sysRoleService.selectRoleById(sysUserRole.getRoleId());
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
index 4ec9510..16cddbe 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
@@ -2,11 +2,12 @@
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.account.api.model.AppUser;
-import com.ruoyi.account.service.IAppUserService;
+import com.ruoyi.account.service.AppUserService;
 import com.ruoyi.common.core.constant.TokenConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
 import org.apache.logging.log4j.core.config.Order;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +35,7 @@
 
 	@Lazy
 	@Resource
-	private IAppUserService appUserService;
+	private AppUserService appUserService;
 
 	@Lazy
 	@Resource
@@ -73,7 +74,7 @@
 		//小程序用户
 		if ("applet".equals(userType)) {
 			AppUser appUser = appUserService.getById(userid);
-			if(null == appUser || appUser.getDelFlag() == 1 || 3 == appUser.getStatus()){
+			if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
 				log.error("[账户异常处理]请求账户id:{}", userid);
 				unauthorizedResponse(response,"无效的账户");
 				return;
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index de64b48..5b3c712 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -10,7 +10,7 @@
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.system.api.vo.LoginUser;
+import com.ruoyi.system.api.model.LoginUser;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -69,8 +69,8 @@
 		loginVo.setPhone(appUser.getPhone());
 		//构建token
 		LoginUser loginUser = new LoginUser();
-		loginUser.setUserId(appUser.getId());
-		loginUser.setName(appUser.getName());
+		loginUser.setUserid(appUser.getId());
+		loginUser.setUsername(appUser.getName());
 		Map<String, Object> tokenApplet = tokenService.createTokenApplet(loginUser);
 		loginVo.setToken(tokenApplet.get("access_token").toString());
 		loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString()));
@@ -108,8 +108,8 @@
 		loginVo.setPhone(appUser.getPhone());
 		//构建token
 		LoginUser loginUser = new LoginUser();
-		loginUser.setUserId(appUser.getId());
-		loginUser.setName(appUser.getName());
+		loginUser.setUserid(appUser.getId());
+		loginUser.setUsername(appUser.getName());
 		Map<String, Object> tokenApplet = tokenService.createTokenApplet(loginUser);
 		loginVo.setToken(tokenApplet.get("access_token").toString());
 		loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString()));
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java
index 2e1c4ee..31b295c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java
@@ -24,13 +24,10 @@
     @Value("${wx.appletsAppSecret}")
     private String wxAppletsAppSecret;
 
-    @Value("{wx.officialAccountAppSecret}")
-    private String officialAccountAppSecret;
-
-    @Value("${wx.appid}")
+//    @Value("${wx.appid}")
     private String webAppId;
 
-    @Value("${wx.appSecret}")
+//    @Value("${wx.appSecret}")
     private String webAppSecret;
 
 
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/AgentApplicationMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AgentApplicationMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/AgentApplicationMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AgentApplicationMapper.xml
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/AppUserMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/AppUserMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/BalanceChangeRecordMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/BalanceChangeRecordMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/UserAddressMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserAddressMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/UserAddressMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserAddressMapper.xml
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/UserCancellationLogMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserCancellationLogMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/UserCancellationLogMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserCancellationLogMapper.xml
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/UserChangeLogMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserChangeLogMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/UserChangeLogMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserChangeLogMapper.xml
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/UserClickLogMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserClickLogMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/UserClickLogMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserClickLogMapper.xml
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/UserCouponMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserCouponMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/UserCouponMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserCouponMapper.xml
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/UserPointMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/UserPointMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/UserSignRecordMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserSignRecordMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/UserSignRecordMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserSignRecordMapper.xml
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapping/WithdrawalRequestsMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml
similarity index 100%
rename from ruoyi-service/ruoyi-account/src/main/resources/mapping/WithdrawalRequestsMapper.xml
rename to ruoyi-service/ruoyi-account/src/main/resources/mapper/account/WithdrawalRequestsMapper.xml
diff --git a/ruoyi-service/ruoyi-order/pom.xml b/ruoyi-service/ruoyi-order/pom.xml
index 9ccb6e7..05fd8b5 100644
--- a/ruoyi-service/ruoyi-order/pom.xml
+++ b/ruoyi-service/ruoyi-order/pom.xml
@@ -58,11 +58,6 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
-    
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
-        </dependency>
         
         <!-- SpringBoot Actuator -->
         <dependency>
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index b943e89..5b040db 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -62,7 +62,7 @@
      */
     @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理-扫码核销校验"})
     @ApiImplicitParams({
-            @ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int"),
+            @ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int", paramType="query"),
     })
     @GetMapping("/check/{orderId}/{shopId}")
     public R<Boolean> check(@PathVariable("orderId") Long orderId, @PathVariable("shopId") Long shopId){
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
index 4a7fceb..d031fe8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
@@ -7,6 +7,7 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
 import org.apache.logging.log4j.core.config.Order;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,16 +32,16 @@
 @Component
 public class AuthFilter implements Filter {
 	private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
-	
+
 	@Lazy
 	@Resource
 	private AppUserClient appUserClient;
-	
+
 	@Lazy
 	@Resource
 	private SysUserClient sysUserClient;
-	
-	
+
+
 	@Override
 	public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
 		HttpServletRequest request = (HttpServletRequest) servletRequest;
@@ -68,7 +69,7 @@
 		//小程序用户
 		if ("applet".equals(userType)) {
 			AppUser appUser = appUserClient.getAppUserById(Long.valueOf(userid));
-			if(null == appUser || appUser.getDelFlag() == 1 || 3 == appUser.getStatus()){
+			if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
 				log.error("[账户异常处理]请求账户id:{}", userid);
 				unauthorizedResponse(response,"无效的账户");
 				return;
@@ -81,9 +82,9 @@
 		}
 		filterChain.doFilter(servletRequest, servletResponse);
 	}
-	
-	
-	
+
+
+
 	private void unauthorizedResponse(HttpServletResponse response, String msg) {
 		response.setStatus(HttpStatus.OK.value());
 		response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE);
@@ -97,9 +98,9 @@
 		writer.flush();
 		writer.close();
 	}
-	
-	
-	
+
+
+
 	/**
 	 * 获取请求token
 	 */
@@ -111,6 +112,6 @@
 		}
 		return token;
 	}
-	
-	
+
+
 }
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java
index 5a116bf..ca051dc 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java
@@ -1,7 +1,7 @@
 package com.ruoyi.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import model.RefundPassOrderGood;
+import model.OrderGood;
 
 /**
  * <p>
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java
index 2569c24..026de1b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java
@@ -1,7 +1,7 @@
 package com.ruoyi.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import model.RefundPassRefundPass;
+import model.RefundPass;
 
 /**
  * <p>
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java
index 57be79b..975af3f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import model.OrderGood;
-import model.RefundPassOrderGood;
 
 /**
  * <p>
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java
index 6851c7f..c6a9eb8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java
@@ -1,9 +1,9 @@
 package com.ruoyi.order.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.OrderGoodMapper;
-import model.RefundPassOrderGood;
-import com.ruoyi.account.service.OrderGoodService;
+import com.ruoyi.order.mapper.OrderGoodMapper;
+import com.ruoyi.order.service.OrderGoodService;
+import model.OrderGood;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
index b3b972b..d0a59ec 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
@@ -1,9 +1,9 @@
 package com.ruoyi.order.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.RefundPassMapper;
-import model.RefundPassRefundPass;
-import com.ruoyi.account.service.RefundPassService;
+import com.ruoyi.order.mapper.RefundPassMapper;
+import com.ruoyi.order.service.RefundPassService;
+import model.RefundPass;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
index ada0bf0..7768bc9 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
@@ -43,70 +43,6 @@
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 ---
-seata:
-  enabled: true
-  application-id: ${spring.application.name}
-  tx-service-group: seata_tx_group    #此处配置自定义的seata事务分组名称
-  enable-auto-data-source-proxy: false    #关闭数据库代理
-  service:
-    vgroup-mapping:
-      seata_tx_group: default
-  data-source-proxy-mode: AT
-  config:
-    type: nacos
-    nacos:
-      # 开发环境
-      server-addr: 192.168.110.169:8848
-      namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9
-      group: DEFAULT_GROUP
-      data-id: seata-server.properties
-      username: nacos
-      password: nacos
-      # 生产环境
-#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
-#      group: DEFAULT_GROUP
-#      data-id: seata-server.properties
-#      username: nacos
-#      password: nacos
-  registry:
-    type: nacos
-    nacos:
-      application: seata-server
-      # 开发环境
-      server-addr: 192.168.110.169:8848
-      namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9
-      group: DEFAULT_GROUP
-      username: nacos
-      password: nacos
-      # 生产环境
-#      server-addr: 192.168.0.137:8848,192.168.0.123:8848
-#      namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
-#      group: DEFAULT_GROUP
-#      username: nacos
-#      password: nacos
-  cloud:
-    nacos:
-      discovery:
-        # 开发环境
-        server-addr: 192.168.110.169:8848
-        namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9 # 命名空间
-        group: DEFAULT_GROUP
-        application: seata-server #Nacos 中 Seata 名称
-        username: nacos
-        password: nacos
-        # 生产环境
-#        server-addr: 192.168.0.137:8848,192.168.0.123:8848
-#        namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
-#        group: DEFAULT_GROUP
-#        application: seata-server #Nacos 中 Seata 名称
-#        username: nacos
-#        password: nacos
-    sentinel:
-      transport:
-        dashboard: 127.0.0.1:8080  #  Sentinel控制台地址
-      eager: true
----
 spring:
   config:
     activate:
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderGoodMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderGoodMapper.xml
new file mode 100644
index 0000000..8a4dd2b
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderGoodMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.OrderGoodMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
new file mode 100644
index 0000000..90a9985
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.OrderMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
new file mode 100644
index 0000000..2033fa7
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.RefundPassMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapping/OrderGoodMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapping/OrderGoodMapper.xml
deleted file mode 100644
index 97a5a2c..0000000
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapping/OrderGoodMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.account.mapper.OrderGoodMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="model.RefundPassOrderGood">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="good_json" property="goodJson" />
-        <result column="num" property="num" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, order_id, good_json, num, del_flag, create_time
-    </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapping/OrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapping/OrderMapper.xml
deleted file mode 100644
index fa996a0..0000000
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapping/OrderMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.account.mapper.OrderMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="model.RefundPassOrder">
-        <id column="id" property="id" />
-        <result column="app_user_id" property="appUserId" />
-        <result column="order_type" property="orderType" />
-        <result column="order_status" property="orderStatus" />
-        <result column="end_time" property="endTime" />
-        <result column="technician_id" property="technicianId" />
-        <result column="order_number" property="orderNumber" />
-        <result column="total_amount" property="totalAmount" />
-        <result column="payment_amount" property="paymentAmount" />
-        <result column="point" property="point" />
-        <result column="pay_method" property="payMethod" />
-        <result column="coupon_json" property="couponJson" />
-        <result column="express_amount" property="expressAmount" />
-        <result column="express_json" property="expressJson" />
-        <result column="share_amount" property="shareAmount" />
-        <result column="get_point" property="getPoint" />
-        <result column="serial_number" property="serialNumber" />
-        <result column="pay_status" property="payStatus" />
-        <result column="shop_id" property="shopId" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, app_user_id, order_type, order_status, end_time, technician_id, order_number, total_amount, payment_amount, point, pay_method, coupon_json, express_amount, express_json, share_amount, get_point, serial_number, pay_status, shop_id, del_flag, create_time
-    </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapping/RefundPassMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapping/RefundPassMapper.xml
deleted file mode 100644
index 5b0035a..0000000
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapping/RefundPassMapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.account.mapper.RefundPassMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="model.RefundPassRefundPass">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="status" property="status" />
-        <result column="refund_method" property="refundMethod" />
-        <result column="refund_reason" property="refundReason" />
-        <result column="user_remark" property="userRemark" />
-        <result column="pics" property="pics" />
-        <result column="pass_status" property="passStatus" />
-        <result column="pass_remark" property="passRemark" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, order_id, status, refund_method, refund_reason, user_remark, pics, pass_status, pass_remark, del_flag, create_time
-    </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/AgreementController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/AgreementController.java
index 73291f1..fd9c1e2 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/AgreementController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/AgreementController.java
@@ -2,7 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.other.api.model.Agreement;
+import com.ruoyi.other.api.domain.Agreement;
 import com.ruoyi.other.service.IAgreementService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java
index b8a3b0d..cb4a599 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java
@@ -7,6 +7,7 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
 import org.apache.logging.log4j.core.config.Order;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,7 +69,7 @@
 		//小程序用户
 		if ("applet".equals(userType)) {
 			AppUser appUser = appUserClient.getAppUserById(Long.valueOf(userid));
-			if(null == appUser || 1 == appUser.getDelFlag() || 3 == appUser.getStatus()){
+			if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
 				log.error("[账户异常处理]请求账户id:{}", userid);
 				unauthorizedResponse(response,"无效的账户");
 				return;
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/AgreementMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/AgreementMapper.java
index 862d725..1baf74d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/AgreementMapper.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/AgreementMapper.java
@@ -1,7 +1,7 @@
 package com.ruoyi.other.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.other.api.model.Agreement;
+import com.ruoyi.other.api.domain.Agreement;
 
 /**
  * @author zhibing.pu
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/IAgreementService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/IAgreementService.java
index efbe659..f4a93d1 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/IAgreementService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/IAgreementService.java
@@ -1,7 +1,7 @@
 package com.ruoyi.other.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.other.api.model.Agreement;
+import com.ruoyi.other.api.domain.Agreement;
 
 /**
  * @author zhibing.pu
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/AgreementServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/AgreementServiceImpl.java
index 75ad805..ec1ac50 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/AgreementServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/AgreementServiceImpl.java
@@ -1,7 +1,7 @@
 package com.ruoyi.other.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.other.api.model.Agreement;
+import com.ruoyi.other.api.domain.Agreement;
 import com.ruoyi.other.mapper.AgreementMapper;
 import com.ruoyi.other.service.IAgreementService;
 import org.springframework.stereotype.Service;
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml
index c9c6dd8..df9a062 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml
@@ -1,10 +1,8 @@
-
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.other.mapper.TechnicianSubscribeMapper">
 
-    <select id="getTechnicianSubscribeByUserAndShop"
-            resultType="com.ruoyi.other.vo.TechnicianSubscribeVO">
+    <select id="getTechnicianSubscribeByUserAndShop" resultType="com.ruoyi.other.vo.TechnicianSubscribeVO">
         SELECT
             tts.user_address,
             ts.`name` shopName,

--
Gitblit v1.7.1