From a4d958dbc8cc45b8d7ef9710e04e0f0dba095425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com>
Date: Thu, 18 Sep 2025 07:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=96=B0=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../oms/controller/LogisticsController.java | 6 -
.../oms/controller/ShopController.java | 2 -
core/model/pom.xml | 72 ++++++
.../main/java/cn/qihangerp/model/Main.java | 7 +
.../qihangerp/model/entity}/BaseEntity.java | 2 +-
.../cn/qihangerp/model/entity}/OGoodsSku.java | 0
.../model/entity}/OLogisticsCompany.java | 2 +-
.../cn/qihangerp/model/entity}/OShop.java | 2 +-
.../model/entity}/OShopPlatform.java | 2 +-
.../model/entity}/OShopPullLasttime.java | 2 +-
.../model/entity}/OShopPullLogs.java | 2 +-
.../qihangerp/model/entity}/SysDictData.java | 2 +-
.../cn/qihangerp/model/entity}/SysRole.java | 2 +-
.../cn/qihangerp/model/entity}/SysTask.java | 2 +-
.../qihangerp/model/entity}/SysTaskLogs.java | 2 +-
.../cn/qihangerp/model/entity}/SysUser.java | 2 +-
.../cn/qihangerp/api/dou/DouApiCommon.java | 1 -
.../dou/controller/DouOrderApiController.java | 1 -
.../controller/DouRefundApiController.java | 1 -
.../java/cn/qihangerp/api/jd/JdApiCommon.java | 1 -
.../cn/qihangerp/api/pdd/PddApiCommon.java | 1 -
.../cn/qihangerp/api/tao/TaoApiCommon.java | 1 -
.../order/service/impl/OOrderServiceImpl.java | 2 -
.../mapper/OLogisticsCompanyMapper.xml | 2 +-
.../src/main/resources/mapper/OShopMapper.xml | 2 +-
.../resources/mapper/OShopPlatformMapper.xml | 2 +-
.../mapper/OShopPullLasttimeMapper.xml | 2 +-
.../resources/mapper/OShopPullLogsMapper.xml | 2 +-
.../resources/mapper/SysTaskLogsMapper.xml | 2 +-
.../main/resources/mapper/SysTaskMapper.xml | 2 +-
.../resources/mapper/SysDictDataMapper.xml | 10 +-
.../main/resources/mapper/SysRoleMapper.xml | 8 +-
.../main/resources/mapper/SysUserMapper.xml | 18 +-
pom.xml | 1 +
vue/src/assets/images/login-background.jpg | Bin 521275 -> 0 bytes
vue/src/assets/images/pay.png | Bin 140720 -> 0 bytes
vue/src/assets/images/profile.gif | Bin 0 -> 6334 bytes
vue/src/store/modules/user.js | 2 +-
vue/src/views/index22.vue | 98 ---------
vue/src/views/login2.vue | 207 ------------------
40 files changed, 117 insertions(+), 358 deletions(-)
create mode 100644 core/model/pom.xml
create mode 100644 core/model/src/main/java/cn/qihangerp/model/Main.java
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/BaseEntity.java (98%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/OGoodsSku.java (100%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/OLogisticsCompany.java (96%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/OShop.java (98%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/OShopPlatform.java (96%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/OShopPullLasttime.java (97%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/OShopPullLogs.java (97%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/SysDictData.java (98%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/SysRole.java (99%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/SysTask.java (95%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/SysTaskLogs.java (95%)
rename core/{common/src/main/java/cn/qihangerp/domain => model/src/main/java/cn/qihangerp/model/entity}/SysUser.java (99%)
delete mode 100644 vue/src/assets/images/login-background.jpg
delete mode 100644 vue/src/assets/images/pay.png
create mode 100644 vue/src/assets/images/profile.gif
delete mode 100644 vue/src/views/index22.vue
delete mode 100644 vue/src/views/login2.vue
diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java
index 42c3de92..7bc0fa6d 100644
--- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java
+++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java
@@ -10,16 +10,10 @@ import cn.qihangerp.domain.OShopPlatform;
import cn.qihangerp.module.service.OLogisticsCompanyService;
import cn.qihangerp.module.service.OShopPlatformService;
import cn.qihangerp.module.service.OShopService;
-import cn.qihangerp.oms.request.ShopBo;
import cn.qihangerp.security.common.BaseController;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.List;
-
/**
* 店铺Controller
*
diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java
index 31a41480..9a633ed0 100644
--- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java
+++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java
@@ -1,7 +1,5 @@
package cn.qihangerp.oms.controller;
-import cn.qihangerp.common.PageQuery;
-import cn.qihangerp.common.PageResult;
import cn.qihangerp.domain.OLogisticsCompany;
import cn.qihangerp.domain.OShopPlatform;
import cn.qihangerp.module.service.OLogisticsCompanyService;
diff --git a/core/model/pom.xml b/core/model/pom.xml
new file mode 100644
index 00000000..b2823bce
--- /dev/null
+++ b/core/model/pom.xml
@@ -0,0 +1,72 @@
+
+
+ 4.0.0
+
+ cn.qihangerp
+ qihangerp-cloud
+ 2.0.6
+ ../../pom.xml
+
+
+ cn.qihangerp.model
+ model
+
+
+ 17
+ 17
+ UTF-8
+
+
+
+ org.apache.commons
+ commons-lang3
+ 3.12.0
+
+
+
+
+
+
+
+
+ org.hibernate.validator
+ hibernate-validator
+ 9.0.0.Final
+
+
+ org.mapstruct
+ mapstruct
+ 1.6.3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ 2.20
+
+
+ io.swagger.core.v3
+ swagger-annotations
+ 2.2.36
+
+
+ com.baomidou
+ mybatis-plus-spring-boot3-starter
+ 3.5.5
+
+
+
\ No newline at end of file
diff --git a/core/model/src/main/java/cn/qihangerp/model/Main.java b/core/model/src/main/java/cn/qihangerp/model/Main.java
new file mode 100644
index 00000000..f689017e
--- /dev/null
+++ b/core/model/src/main/java/cn/qihangerp/model/Main.java
@@ -0,0 +1,7 @@
+package cn.qihangerp.model;
+
+public class Main {
+ public static void main(String[] args) {
+ System.out.println("Hello, World!");
+ }
+}
\ No newline at end of file
diff --git a/core/common/src/main/java/cn/qihangerp/domain/BaseEntity.java b/core/model/src/main/java/cn/qihangerp/model/entity/BaseEntity.java
similarity index 98%
rename from core/common/src/main/java/cn/qihangerp/domain/BaseEntity.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/BaseEntity.java
index 27dc9541..11d894c1 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/BaseEntity.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/BaseEntity.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import java.io.Serializable;
diff --git a/core/common/src/main/java/cn/qihangerp/domain/OGoodsSku.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSku.java
similarity index 100%
rename from core/common/src/main/java/cn/qihangerp/domain/OGoodsSku.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSku.java
diff --git a/core/common/src/main/java/cn/qihangerp/domain/OLogisticsCompany.java b/core/model/src/main/java/cn/qihangerp/model/entity/OLogisticsCompany.java
similarity index 96%
rename from core/common/src/main/java/cn/qihangerp/domain/OLogisticsCompany.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/OLogisticsCompany.java
index 6f450cef..6dece293 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/OLogisticsCompany.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/OLogisticsCompany.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/core/common/src/main/java/cn/qihangerp/domain/OShop.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShop.java
similarity index 98%
rename from core/common/src/main/java/cn/qihangerp/domain/OShop.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/OShop.java
index 521fcb9c..dbcccefc 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/OShop.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShop.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/core/common/src/main/java/cn/qihangerp/domain/OShopPlatform.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPlatform.java
similarity index 96%
rename from core/common/src/main/java/cn/qihangerp/domain/OShopPlatform.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/OShopPlatform.java
index de55f248..5b385872 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/OShopPlatform.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPlatform.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import java.io.Serializable;
diff --git a/core/common/src/main/java/cn/qihangerp/domain/OShopPullLasttime.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLasttime.java
similarity index 97%
rename from core/common/src/main/java/cn/qihangerp/domain/OShopPullLasttime.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLasttime.java
index 27718004..5ceced08 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/OShopPullLasttime.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLasttime.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import java.io.Serializable;
import java.time.LocalDateTime;
diff --git a/core/common/src/main/java/cn/qihangerp/domain/OShopPullLogs.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLogs.java
similarity index 97%
rename from core/common/src/main/java/cn/qihangerp/domain/OShopPullLogs.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLogs.java
index 10c1e1ca..a912a0fa 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/OShopPullLogs.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLogs.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import java.io.Serializable;
import java.util.Date;
diff --git a/core/common/src/main/java/cn/qihangerp/domain/SysDictData.java b/core/model/src/main/java/cn/qihangerp/model/entity/SysDictData.java
similarity index 98%
rename from core/common/src/main/java/cn/qihangerp/domain/SysDictData.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/SysDictData.java
index d7672693..195c3999 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/SysDictData.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/SysDictData.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import cn.qihangerp.common.constant.UserConstants;
diff --git a/core/common/src/main/java/cn/qihangerp/domain/SysRole.java b/core/model/src/main/java/cn/qihangerp/model/entity/SysRole.java
similarity index 99%
rename from core/common/src/main/java/cn/qihangerp/domain/SysRole.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/SysRole.java
index bc3a58c0..76593597 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/SysRole.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/SysRole.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import java.util.Date;
import java.util.Map;
diff --git a/core/common/src/main/java/cn/qihangerp/domain/SysTask.java b/core/model/src/main/java/cn/qihangerp/model/entity/SysTask.java
similarity index 95%
rename from core/common/src/main/java/cn/qihangerp/domain/SysTask.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/SysTask.java
index 7dfbc181..7f7ba7b4 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/SysTask.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/SysTask.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import java.io.Serializable;
import java.util.Date;
diff --git a/core/common/src/main/java/cn/qihangerp/domain/SysTaskLogs.java b/core/model/src/main/java/cn/qihangerp/model/entity/SysTaskLogs.java
similarity index 95%
rename from core/common/src/main/java/cn/qihangerp/domain/SysTaskLogs.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/SysTaskLogs.java
index 35223d4a..aab1a6be 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/SysTaskLogs.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/SysTaskLogs.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import java.io.Serializable;
import java.util.Date;
diff --git a/core/common/src/main/java/cn/qihangerp/domain/SysUser.java b/core/model/src/main/java/cn/qihangerp/model/entity/SysUser.java
similarity index 99%
rename from core/common/src/main/java/cn/qihangerp/domain/SysUser.java
rename to core/model/src/main/java/cn/qihangerp/model/entity/SysUser.java
index 2d99d785..a7979219 100644
--- a/core/common/src/main/java/cn/qihangerp/domain/SysUser.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/SysUser.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.domain;
+package cn.qihangerp.model.entity;
import java.util.Date;
diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java
index d66ae5c3..37ada00f 100644
--- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java
+++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java
@@ -6,7 +6,6 @@ import cn.qihangerp.common.api.ShopApiParams;
import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.domain.OShopPlatform;
-import cn.qihangerp.module.service.OShopPlatformService;
import cn.qihangerp.module.service.OShopService;
import cn.qihangerp.open.common.ApiResultVo;
import cn.qihangerp.sdk.dou.DouTokenApiHelper;
diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java
index 2702c21a..46c13e8f 100644
--- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java
+++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java
@@ -18,7 +18,6 @@ import cn.qihangerp.module.service.OShopPullLasttimeService;
import cn.qihangerp.module.service.OShopPullLogsService;
import cn.qihangerp.open.common.ApiResultVo;
import cn.qihangerp.open.dou.DouOrderApiHelper;
-import cn.qihangerp.open.dou.model.Token;
import cn.qihangerp.open.dou.model.order.Order;
import cn.qihangerp.sdk.dou.PullRequest;
import com.alibaba.fastjson2.JSONObject;
diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java
index 9605195b..2cc9c539 100644
--- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java
+++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java
@@ -16,7 +16,6 @@ import cn.qihangerp.module.service.OShopPullLasttimeService;
import cn.qihangerp.module.service.OShopPullLogsService;
import cn.qihangerp.open.common.ApiResultVo;
import cn.qihangerp.open.dou.DouRefundApiHelper;
-import cn.qihangerp.open.dou.model.Token;
import cn.qihangerp.open.dou.model.after.AfterSale;
import cn.qihangerp.sdk.dou.PullRequest;
import com.alibaba.fastjson2.JSONObject;
diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java
index d34f0cd6..8f1fdba3 100644
--- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java
+++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java
@@ -6,7 +6,6 @@ import cn.qihangerp.common.api.ShopApiParams;
import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.domain.OShopPlatform;
-import cn.qihangerp.module.service.OShopPlatformService;
import cn.qihangerp.module.service.OShopService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java
index a55bd1e0..d32d63fa 100644
--- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java
+++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java
@@ -6,7 +6,6 @@ import cn.qihangerp.common.api.ShopApiParams;
import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.domain.OShopPlatform;
-import cn.qihangerp.module.service.OShopPlatformService;
import cn.qihangerp.module.service.OShopService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java
index 650fe650..e9836654 100644
--- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java
+++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java
@@ -6,7 +6,6 @@ import cn.qihangerp.common.api.ShopApiParams;
import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.domain.OShopPlatform;
-import cn.qihangerp.module.service.OShopPlatformService;
import cn.qihangerp.module.service.OShopService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
index 4b7c20a7..5ad7a8a6 100644
--- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
+++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
@@ -1,8 +1,6 @@
package cn.qihangerp.module.order.service.impl;
-import cn.qihangerp.common.bo.ShipOrderAllocateShipBo;
-import cn.qihangerp.common.bo.ShopOrderShipBo;
import cn.qihangerp.domain.OLogisticsCompany;
import cn.qihangerp.module.goods.domain.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku;
diff --git a/module/shop/src/main/resources/mapper/OLogisticsCompanyMapper.xml b/module/shop/src/main/resources/mapper/OLogisticsCompanyMapper.xml
index a0ac8e32..21af5b21 100644
--- a/module/shop/src/main/resources/mapper/OLogisticsCompanyMapper.xml
+++ b/module/shop/src/main/resources/mapper/OLogisticsCompanyMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
diff --git a/module/shop/src/main/resources/mapper/OShopMapper.xml b/module/shop/src/main/resources/mapper/OShopMapper.xml
index 3cb31d53..373761d8 100644
--- a/module/shop/src/main/resources/mapper/OShopMapper.xml
+++ b/module/shop/src/main/resources/mapper/OShopMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
diff --git a/module/shop/src/main/resources/mapper/OShopPlatformMapper.xml b/module/shop/src/main/resources/mapper/OShopPlatformMapper.xml
index d156cd0f..811f8eef 100644
--- a/module/shop/src/main/resources/mapper/OShopPlatformMapper.xml
+++ b/module/shop/src/main/resources/mapper/OShopPlatformMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
diff --git a/module/shop/src/main/resources/mapper/OShopPullLasttimeMapper.xml b/module/shop/src/main/resources/mapper/OShopPullLasttimeMapper.xml
index 2ea3d101..306ed8f2 100644
--- a/module/shop/src/main/resources/mapper/OShopPullLasttimeMapper.xml
+++ b/module/shop/src/main/resources/mapper/OShopPullLasttimeMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
diff --git a/module/shop/src/main/resources/mapper/OShopPullLogsMapper.xml b/module/shop/src/main/resources/mapper/OShopPullLogsMapper.xml
index 3c35f738..e7228fab 100644
--- a/module/shop/src/main/resources/mapper/OShopPullLogsMapper.xml
+++ b/module/shop/src/main/resources/mapper/OShopPullLogsMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
diff --git a/module/shop/src/main/resources/mapper/SysTaskLogsMapper.xml b/module/shop/src/main/resources/mapper/SysTaskLogsMapper.xml
index 3825b032..c8e527b9 100644
--- a/module/shop/src/main/resources/mapper/SysTaskLogsMapper.xml
+++ b/module/shop/src/main/resources/mapper/SysTaskLogsMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
diff --git a/module/shop/src/main/resources/mapper/SysTaskMapper.xml b/module/shop/src/main/resources/mapper/SysTaskMapper.xml
index 5a981cec..eb51a934 100644
--- a/module/shop/src/main/resources/mapper/SysTaskMapper.xml
+++ b/module/shop/src/main/resources/mapper/SysTaskMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
diff --git a/module/sys/src/main/resources/mapper/SysDictDataMapper.xml b/module/sys/src/main/resources/mapper/SysDictDataMapper.xml
index 249809dd..6b21897e 100644
--- a/module/sys/src/main/resources/mapper/SysDictDataMapper.xml
+++ b/module/sys/src/main/resources/mapper/SysDictDataMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_dict_data
-