From c0988a381defad378025e872a70a01b728c6f34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Tue, 16 Jul 2024 10:41:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=20packagename=20=E5=86=99=E6=AD=BB?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 "multiple/\344\270\273\345\255\220Contoller.java"    | 12 +++++++++---
 "multiple/\344\270\273\345\256\236\344\275\223.java" |  2 +-
 "multiple/\345\255\220Mapper.java"                   |  2 +-
 "multiple/\345\255\220\345\256\236\344\275\223.java" |  2 +-
 single/Controller.java                               | 12 +++++++++---
 "single/\345\256\236\344\275\223.java"               |  2 +-
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git "a/multiple/\344\270\273\345\255\220Contoller.java" "b/multiple/\344\270\273\345\255\220Contoller.java"
index a0ad264..f4c079f 100644
--- "a/multiple/\344\270\273\345\255\220Contoller.java"
+++ "b/multiple/\344\270\273\345\255\220Contoller.java"
@@ -7,13 +7,19 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.pig4cloud.pigx.common.core.util.R;
-import com.pig4cloud.pigx.common.log.annotation.SysLog;
+#if($opensource)
+import ${package}.common.core.util.R;
+import ${package}.log.annotation.SysLog;
+import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
+#else
+import ${package}.common.core.util.R;
+import ${package}.common.log.annotation.SysLog;
+import ${package}.common.excel.annotation.ResponseExcel;
+#end
 import ${package}.${moduleName}.entity.${ClassName}Entity;
 import ${package}.${moduleName}.entity.${ChildClassName}Entity;
 import ${package}.${moduleName}.service.${ClassName}Service;
 import org.springframework.security.access.prepost.PreAuthorize;
-import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 #if($isSpringBoot3)
 import org.springdoc.core.annotations.ParameterObject;
diff --git "a/multiple/\344\270\273\345\256\236\344\275\223.java" "b/multiple/\344\270\273\345\256\236\344\275\223.java"
index e6fb255..2599fd3 100644
--- "a/multiple/\344\270\273\345\256\236\344\275\223.java"
+++ "b/multiple/\344\270\273\345\256\236\344\275\223.java"
@@ -6,7 +6,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 #if($isTenant)
-import com.pig4cloud.pigx.common.core.util.TenantTable;
+import ${package}.common.core.util.TenantTable;
 #end
 #foreach($import in $importList)
 import $import;
diff --git "a/multiple/\345\255\220Mapper.java" "b/multiple/\345\255\220Mapper.java"
index 7d89b7b..bb50033 100644
--- "a/multiple/\345\255\220Mapper.java"
+++ "b/multiple/\345\255\220Mapper.java"
@@ -1,6 +1,6 @@
 package ${package}.${moduleName}.mapper;
 
-import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
+import ${package}.common.data.datascope.PigxBaseMapper;
 import ${package}.${moduleName}.entity.${ChildClassName}Entity;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git "a/multiple/\345\255\220\345\256\236\344\275\223.java" "b/multiple/\345\255\220\345\256\236\344\275\223.java"
index 5791b94..336d649 100644
--- "a/multiple/\345\255\220\345\256\236\344\275\223.java"
+++ "b/multiple/\345\255\220\345\256\236\344\275\223.java"
@@ -4,7 +4,7 @@
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 #if($isChildTenant)
-import com.pig4cloud.pigx.common.core.util.TenantTable;
+import ${package}.common.core.util.TenantTable;
 #end
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/single/Controller.java b/single/Controller.java
index 737205c..af8012f 100644
--- a/single/Controller.java
+++ b/single/Controller.java
@@ -8,12 +8,18 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.pig4cloud.pigx.common.core.util.R;
-import com.pig4cloud.pigx.common.log.annotation.SysLog;
+#if($opensource)
+import ${package}.common.core.util.R;
+import ${package}.log.annotation.SysLog;
+import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
+#else
+import ${package}.common.core.util.R;
+import ${package}.common.log.annotation.SysLog;
+import ${package}.common.excel.annotation.ResponseExcel;
+#end
 import ${package}.${moduleName}.entity.${ClassName}Entity;
 import ${package}.${moduleName}.service.${ClassName}Service;
 import org.springframework.security.access.prepost.PreAuthorize;
-import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 #if($isSpringBoot3)
 import org.springdoc.core.annotations.ParameterObject;
diff --git "a/single/\345\256\236\344\275\223.java" "b/single/\345\256\236\344\275\223.java"
index 910b6cf..d6036fa 100644
--- "a/single/\345\256\236\344\275\223.java"
+++ "b/single/\345\256\236\344\275\223.java"
@@ -6,7 +6,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 #if($isTenant)
-import com.pig4cloud.pigx.common.core.util.TenantTable;
+import ${package}.common.core.util.TenantTable;
 #end
 #foreach($import in $importList)
 import $import;