From 32fcf168e39d2e7cc763598dcbaf049db0c1a92a Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 19 Dec 2024 16:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=85=A5=E8=B6=85=E5=B8=82erp?=
 =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {erp => pjcloud-supermarket-erp}/.editorconfig              | 0
 {erp => pjcloud-supermarket-erp}/README.md                  | 0
 .../pjcloud-supermarket-erp-api}/pom.xml                    | 4 ++--
 .../java/com/bsd/pjcloud/erp/api/feign/packge-info.java     | 0
 .../main/java/com/bsd/pjcloud/erp/constant/packge-info.java | 0
 .../src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java  | 0
 .../main/java/com/bsd/pjcloud/erp/entity/packge-info.java   | 0
 .../pjcloud-supermarket-erp-biz}/pom.xml                    | 6 +++---
 .../src/main/java/com/bsd/pjcloud/erp/ErpApp.java           | 0
 .../java/com/bsd/pjcloud/erp/controller/packge-info.java    | 0
 .../main/java/com/bsd/pjcloud/erp/mapper/packge-info.java   | 0
 .../main/java/com/bsd/pjcloud/erp/service/packge-info.java  | 0
 .../src/main/resources/application.yml                      | 0
 .../src/main/resources/logback-spring.xml                   | 0
 {erp => pjcloud-supermarket-erp}/pom.xml                    | 6 +++---
 pjcloud-supermarket/pjcloud-supermarket-api/pom.xml         | 2 +-
 pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml         | 4 ++--
 .../java/com/bsd/pjcloud/supermarket/SuperMarketApp.java    | 4 ++--
 pjcloud-supermarket/pom.xml                                 | 2 +-
 pom.xml                                                     | 2 +-
 20 files changed, 15 insertions(+), 15 deletions(-)
 rename {erp => pjcloud-supermarket-erp}/.editorconfig (100%)
 rename {erp => pjcloud-supermarket-erp}/README.md (100%)
 rename {erp/erp-api => pjcloud-supermarket-erp/pjcloud-supermarket-erp-api}/pom.xml (91%)
 rename {erp/erp-api => pjcloud-supermarket-erp/pjcloud-supermarket-erp-api}/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java (100%)
 rename {erp/erp-api => pjcloud-supermarket-erp/pjcloud-supermarket-erp-api}/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java (100%)
 rename {erp/erp-api => pjcloud-supermarket-erp/pjcloud-supermarket-erp-api}/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java (100%)
 rename {erp/erp-api => pjcloud-supermarket-erp/pjcloud-supermarket-erp-api}/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java (100%)
 rename {erp/erp-biz => pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz}/pom.xml (96%)
 rename {erp/erp-biz => pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz}/src/main/java/com/bsd/pjcloud/erp/ErpApp.java (100%)
 rename {erp/erp-biz => pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz}/src/main/java/com/bsd/pjcloud/erp/controller/packge-info.java (100%)
 rename {erp/erp-biz => pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz}/src/main/java/com/bsd/pjcloud/erp/mapper/packge-info.java (100%)
 rename {erp/erp-biz => pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz}/src/main/java/com/bsd/pjcloud/erp/service/packge-info.java (100%)
 rename {erp/erp-biz => pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz}/src/main/resources/application.yml (100%)
 rename {erp/erp-biz => pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz}/src/main/resources/logback-spring.xml (100%)
 rename {erp => pjcloud-supermarket-erp}/pom.xml (77%)

diff --git a/erp/.editorconfig b/pjcloud-supermarket-erp/.editorconfig
similarity index 100%
rename from erp/.editorconfig
rename to pjcloud-supermarket-erp/.editorconfig
diff --git a/erp/README.md b/pjcloud-supermarket-erp/README.md
similarity index 100%
rename from erp/README.md
rename to pjcloud-supermarket-erp/README.md
diff --git a/erp/erp-api/pom.xml b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/pom.xml
similarity index 91%
rename from erp/erp-api/pom.xml
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/pom.xml
index d4823cdee..7d0df7918 100644
--- a/erp/erp-api/pom.xml
+++ b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/pom.xml
@@ -6,11 +6,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.bsd</groupId>
-		<artifactId>erp</artifactId>
+		<artifactId>pjcloud-supermarket-erp</artifactId>
 		<version>5.7.0</version>
 	</parent>
 
-	<artifactId>erp-api</artifactId>
+	<artifactId>pjcloud-supermarket-erp-api</artifactId>
 
 	<dependencies>
 		<!-- 连表查询注解 -->
diff --git a/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java
similarity index 100%
rename from erp/erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java
diff --git a/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java
similarity index 100%
rename from erp/erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java
diff --git a/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java
similarity index 100%
rename from erp/erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java
diff --git a/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java
similarity index 100%
rename from erp/erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java
diff --git a/erp/erp-biz/pom.xml b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/pom.xml
similarity index 96%
rename from erp/erp-biz/pom.xml
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/pom.xml
index d12e1b385..3211d2275 100644
--- a/erp/erp-biz/pom.xml
+++ b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/pom.xml
@@ -6,11 +6,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.bsd</groupId>
-        <artifactId>erp</artifactId>
+        <artifactId>pjcloud-supermarket-erp</artifactId>
         <version>5.7.0</version>
     </parent>
 
-    <artifactId>erp-biz</artifactId>
+    <artifactId>pjcloud-supermarket-erp-biz</artifactId>
 
     <dependencies>
         <!--必备: undertow容器-->
@@ -61,7 +61,7 @@
         <!--必备: 依赖api模块-->
         <dependency>
             <groupId>com.bsd</groupId>
-            <artifactId>erp-api</artifactId>
+            <artifactId>pjcloud-supermarket-erp-api</artifactId>
             <version>5.7.0</version>
         </dependency>
         <!--必备: log 依赖-->
diff --git a/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/ErpApp.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/ErpApp.java
similarity index 100%
rename from erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/ErpApp.java
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/ErpApp.java
diff --git a/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/controller/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/controller/packge-info.java
similarity index 100%
rename from erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/controller/packge-info.java
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/controller/packge-info.java
diff --git a/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/mapper/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/mapper/packge-info.java
similarity index 100%
rename from erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/mapper/packge-info.java
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/mapper/packge-info.java
diff --git a/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/service/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/service/packge-info.java
similarity index 100%
rename from erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/service/packge-info.java
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/erp/service/packge-info.java
diff --git a/erp/erp-biz/src/main/resources/application.yml b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml
similarity index 100%
rename from erp/erp-biz/src/main/resources/application.yml
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml
diff --git a/erp/erp-biz/src/main/resources/logback-spring.xml b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/logback-spring.xml
similarity index 100%
rename from erp/erp-biz/src/main/resources/logback-spring.xml
rename to pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/logback-spring.xml
diff --git a/erp/pom.xml b/pjcloud-supermarket-erp/pom.xml
similarity index 77%
rename from erp/pom.xml
rename to pjcloud-supermarket-erp/pom.xml
index e7582a332..4a05ca348 100644
--- a/erp/pom.xml
+++ b/pjcloud-supermarket-erp/pom.xml
@@ -10,12 +10,12 @@
 		<version>5.7.0</version>
 	</parent>
 
-	<artifactId>erp</artifactId>
+	<artifactId>pjcloud-supermarket-erp</artifactId>
 	<packaging>pom</packaging>
 
 	<!--项目子模块-->
 	<modules>
-		<module>erp-api</module>
-		<module>erp-biz</module>
+		<module>pjcloud-supermarket-erp-api</module>
+		<module>pjcloud-supermarket-erp-biz</module>
 	</modules>
 </project>
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/pom.xml b/pjcloud-supermarket/pjcloud-supermarket-api/pom.xml
index 733d4054a..b4c85b903 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/pom.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.bsd</groupId>
 		<artifactId>pjcloud-supermarket</artifactId>
-		<version>5.6.0</version>
+		<version>5.7.0</version>
 	</parent>
 
 	<artifactId>pjcloud-supermarket-api</artifactId>
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml
index 7cf5b21eb..8eac7c638 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.bsd</groupId>
         <artifactId>pjcloud-supermarket</artifactId>
-        <version>5.6.0</version>
+        <version>5.7.0</version>
     </parent>
 
     <artifactId>pjcloud-supermarket-biz</artifactId>
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>com.bsd</groupId>
             <artifactId>pjcloud-supermarket-api</artifactId>
-            <version>5.6.0</version>
+            <version>5.7.0</version>
         </dependency>
         <!--必备: log 依赖-->
         <dependency>
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/SuperMarketApp.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/SuperMarketApp.java
index 462999984..20e77dfd0 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/SuperMarketApp.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/SuperMarketApp.java
@@ -17,8 +17,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 @EnableDiscoveryClient
 @EnablePjcloudResourceServer
 @SpringBootApplication
-public class App {
+public class SuperMarketApp {
     public static void main(String[] args) {
-        SpringApplication.run(App.class, args);
+        SpringApplication.run(SuperMarketApp.class, args);
     }
 }
diff --git a/pjcloud-supermarket/pom.xml b/pjcloud-supermarket/pom.xml
index 340c3585b..55945fd2a 100644
--- a/pjcloud-supermarket/pom.xml
+++ b/pjcloud-supermarket/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.bsd</groupId>
 		<artifactId>pjcloud</artifactId>
-		<version>5.6.0</version>
+		<version>5.7.0</version>
 	</parent>
 
 	<artifactId>pjcloud-supermarket</artifactId>
diff --git a/pom.xml b/pom.xml
index 8508e7ff4..f51c17bde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
         <module>pjcloud-app-server</module>
         <module>pjcloud-thirdparty</module>
         <module>pjcloud-canteen</module>
-    <module>erp</module>
+    <module>pjcloud-supermarket-erp</module>
     <module>pjcloud-wallet</module>
     <module>pjcloud-supermarket</module>
   </modules>