增加商户端模块

pom.xml

@@ -329,6 +329,12 @@
                 <version>${PeiZhen-Java.version}</version>
                 <version>${PeiZhen-Java.version}</version>
             </dependency>
             </dependency>
 
 
+            <!--商户模块-->
+            <dependency>
+                <groupId>com.pz</groupId>
+                <artifactId>pz-merchant</artifactId>
+                <version>${PeiZhen-Java.version}</version>
+            </dependency>
             <!-- 小程序用户模块 -->
             <!-- 小程序用户模块 -->
             <dependency>
             <dependency>
                 <groupId>com.pz</groupId>
                 <groupId>com.pz</groupId>
@@ -350,6 +356,7 @@
         <module>pz-oss</module>
         <module>pz-oss</module>
         <module>pz-sms</module>
         <module>pz-sms</module>
         <module>pz-accompany</module>
         <module>pz-accompany</module>
+        <module>pz-merchant</module>
         <module>pz-applet</module>
         <module>pz-applet</module>
     </modules>
     </modules>
     <packaging>pom</packaging>
     <packaging>pom</packaging>

pz-admin/pom.xml

@@ -71,6 +71,11 @@
             <groupId>com.pz</groupId>
             <groupId>com.pz</groupId>
             <artifactId>pz-generator</artifactId>
             <artifactId>pz-generator</artifactId>
         </dependency>
         </dependency>
+        <!--商户模块-->
+        <dependency>
+            <groupId>com.pz</groupId>
+            <artifactId>pz-merchant</artifactId>
+        </dependency>
 
 
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
@@ -79,16 +84,16 @@
         </dependency>
         </dependency>
 
 
         <!-- skywalking 整合 logback -->
         <!-- skywalking 整合 logback -->
-<!--        <dependency>-->
-<!--            <groupId>org.apache.skywalking</groupId>-->
-<!--            <artifactId>apm-toolkit-logback-1.x</artifactId>-->
-<!--            <version>${与你的agent探针版本保持一致}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.apache.skywalking</groupId>-->
-<!--            <artifactId>apm-toolkit-trace</artifactId>-->
-<!--            <version>${与你的agent探针版本保持一致}</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.apache.skywalking</groupId>-->
+        <!--            <artifactId>apm-toolkit-logback-1.x</artifactId>-->
+        <!--            <version>${与你的agent探针版本保持一致}</version>-->
+        <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.apache.skywalking</groupId>-->
+        <!--            <artifactId>apm-toolkit-trace</artifactId>-->
+        <!--            <version>${与你的agent探针版本保持一致}</version>-->
+        <!--        </dependency>-->
 
 
     </dependencies>
     </dependencies>
 
 

pz-merchant/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.pz</groupId>
+        <artifactId>PeiZhen-Java</artifactId>
+        <version>4.8.0</version>
+    </parent>
+
+    <artifactId>pz-merchant</artifactId>
+    <packaging>jar</packaging>
+    <description>
+        商户端
+    </description>
+
+    <dependencies>
+        <!-- 系统业务-->
+        <dependency>
+            <groupId>com.pz</groupId>
+            <artifactId>pz-system</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>