Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
This commit is contained in:
guwd 2020-09-10 11:49:26 +08:00
commit 47df10a876
1 changed files with 2 additions and 2 deletions

View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mcms</artifactId>
<version>5.1-SNAPSHOT</version>
<version>5.1</version>
<name>ms-mcms</name>
<properties>
<java.version>1.8</java.version>
@ -20,7 +20,7 @@
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mpeople</artifactId>
<version>1.0.25</version>
<version>1.0.26</version>
</dependency>
<!-- 此部分是铭飞平台MStroe的客户端MStore不在铭飞开源产品范围如果不需要使用MStore可以删除掉 -->
<dependency>