Merge remote-tracking branch 'origin/master'

This commit is contained in:
sgjj 2020-09-18 16:51:56 +08:00
commit b4866a6ce2
4 changed files with 10 additions and 10 deletions

View File

@ -24,12 +24,12 @@
</p> </p>
<p align="center"> <p align="center">
<a href="https://ms.mingsoft.net" target="_blank">铭飞平台</a> <a href="https://www.mingsoft.net" target="_blank">铭飞平台</a>
<a href="http://demo.cms.mingsoft.net/ms/login.do" target="_blank">在线演示</a> <a href="http://cms.demo.mingsoft.net/ms/login.do" target="_blank">在线演示</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/" target="_blank">在线使用手册</a> <a href="http://doc.mingsoft.net/plugs-cms/" target="_blank">在线使用手册</a>
<a href="https://mingsoft.ke.qq.com/?tuin=383187f3#tab=1&category=-1" target="_blank">腾讯课堂在线视频</a><br/> <a href="https://mingsoft.ke.qq.com/?tuin=383187f3#tab=1&category=-1" target="_blank">腾讯课堂在线视频</a><br/>
<a href="https://ke.qq.com/course/478498" target="_blank">代码生成器视频教程</a><br/> <a href="https://ke.qq.com/course/478498" target="_blank">代码生成器视频教程</a><br/>
<a href="http://file.mingsoft.net/ms-runner-5.0.0.zip" target="_blank">Windows一键运行版本\Linux一键运行版本</a> <a href="https://cloud.189.cn/t/I3maM3uURjmm" target="_blank">Windows一键运行版本\Linux一键运行版本</a>
</p> </p>
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -153,8 +153,8 @@ git clone https://gitee.com/mingSoft/MCMS.git<br/>
# 文档 # 文档
* MCms标签手册 http://doc.ms.mingsoft.net/mcms-tag-guide * MCms标签手册 http://doc.mingsoft.net/mcms-tag-guide
* 快速开发手册 http://doc.ms.mingsoft.net/dev-guide/ * 快速开发手册 http://doc.mingsoft.net/dev-guide/
# 软件截图 # 软件截图

View File

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

View File

@ -15,13 +15,14 @@
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>ms-mpeople</artifactId> <artifactId>ms-mpeople</artifactId>
<version>1.0.26</version> <version>1.0.28</version>
</dependency> </dependency>
<!-- 此部分是铭飞平台MStroe的客户端MStore不在铭飞开源产品范围如果不需要使用MStore可以删除掉 --> <!-- 此部分是铭飞平台MStroe的客户端MStore不在铭飞开源产品范围如果不需要使用MStore可以删除掉 -->
<dependency> <dependency>

View File

@ -21,7 +21,7 @@
<dependency> <dependency>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>ms-mpeople</artifactId> <artifactId>ms-mpeople</artifactId>
<version>1.0.26</version> <version>1.0.28</version>
</dependency> </dependency>
<!-- 此部分是铭飞平台MStroe的客户端MStore不在铭飞开源产品范围如果不需要使用MStore可以删除掉 --> <!-- 此部分是铭飞平台MStroe的客户端MStore不在铭飞开源产品范围如果不需要使用MStore可以删除掉 -->
@ -69,7 +69,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration> <configuration>
<source>${java.version}</source> <source>${java.version}</source>
<target>${java.version}</target> <target>${java.version}</target>