Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRefundController.java

pom.xml

@@ -25,6 +25,7 @@
 		<module>yami-shop-multishop</module>
 		<module>yami-shop-platform</module>
         <module>yami-shop-delivery</module>
+        <module>yami-shop-wx</module>
     </modules>
 
     <properties>

yami-shop-api/pom.xml

@@ -68,6 +68,11 @@
 			<artifactId>yami-shop-delivery-api</artifactId>
 			<version>${yami.shop.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.yami.shop</groupId>
+			<artifactId>yami-shop-wx</artifactId>
+			<version>${yami.shop.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>

yami-shop-wx/pom.xml

@@ -0,0 +1,30 @@
+<?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">
+    <parent>
+        <artifactId>yami-shop</artifactId>
+        <groupId>com.yami.shop</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yami-shop-wx</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>5.3.3.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yami.shop</groupId>
+            <artifactId>yami-shop-service</artifactId>
+            <version>${yami.shop.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>